Changeset fcab7ef in mainline for uspace/srv/vfs/vfs_ipc.c

Timestamp:

2017-03-26T20:46:56Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

fe91f66

Parents:

f644472

Message:

Merge dup2() into vfs_clone()

File:

• uspace/srv/vfs/vfs_ipc.c (modified) (3 diffs)

uspace/srv/vfs/vfs_ipc.c

@@ -37 +37 @@
 {
         int oldfd = IPC_GET_ARG1(*request);
-        bool desc = IPC_GET_ARG2(*request);
-        
-        int ret = vfs_op_clone(oldfd, desc);
+        int newfd = IPC_GET_ARG2(*request);
+        bool desc = IPC_GET_ARG3(*request);
+        
+        int ret = vfs_op_clone(oldfd, newfd, desc);
         async_answer_0(rid, ret);
 }
@@ -48 +49 @@
         int rc = vfs_op_close(fd);
         async_answer_0(rid, rc);
-}
-
-static void vfs_in_dup(ipc_callid_t rid, ipc_call_t *request)
-{
-        int oldfd = IPC_GET_ARG1(*request);
-        int newfd = IPC_GET_ARG2(*request);
-        int rc = vfs_op_dup(oldfd, newfd);
-        async_answer_1(rid, rc, newfd);
 }
 
@@ -279 +272 @@
                         vfs_in_close(callid, &call);
                         break;
-                case VFS_IN_DUP:
-                        vfs_in_dup(callid, &call);
-                        break;
                 case VFS_IN_FSTAT:
                         vfs_in_fstat(callid, &call);