Changeset fcab7ef in mainline for uspace/lib/c/generic/vfs/vfs.c

Timestamp:

2017-03-26T20:46:56Z (8 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/lib/c/generic/vfs/vfs.c (modified) (4 diffs)

uspace/lib/c/generic/vfs/vfs.c

@@ -76 +76 @@
                 r = ENOENT;
         else
-                r = vfs_clone(root_fd, true);
+                r = vfs_clone(root_fd, -1, true);
         fibril_mutex_unlock(&root_mutex);
         return r;
@@ -86 +86 @@
         if (root_fd >= 0)
                 close(root_fd);
-        root_fd = vfs_clone(nroot, true);
+        root_fd = vfs_clone(nroot, -1, true);
         fibril_mutex_unlock(&root_mutex);
 }
@@ -1071 +1071 @@
 }
 
-/** Duplicate open file.
- *
- * Duplicate open file under a new file descriptor.
- *
- * @param oldfd Old file descriptor
- * @param newfd New file descriptor
- * @return 0 on success. On error -1 is returned and errno is set
- */
-int dup2(int oldfd, int newfd)
-{
-        async_exch_t *exch = vfs_exchange_begin();
-        
-        sysarg_t ret;
-        sysarg_t rc = async_req_2_1(exch, VFS_IN_DUP, oldfd, newfd, &ret);
-        
-        vfs_exchange_end(exch);
-        
-        if (rc == EOK)
-                rc = ret;
-        
-        if (rc != EOK) {
-                errno = rc;
-                return -1;
-        }
-        
-        return 0;
-}
-
 static void process_mp(const char *path, struct stat *stat, list_t *mtab_list)
 {
@@ -1254 +1226 @@
 }
 
-int vfs_clone(int file, bool high_descriptor)
+int vfs_clone(int file_from, int file_to, bool high_descriptor)
 {
         async_exch_t *vfs_exch = vfs_exchange_begin();
-        int rc = async_req_2_0(vfs_exch, VFS_IN_CLONE, (sysarg_t) file,
-            (sysarg_t) high_descriptor);
+        int rc = async_req_3_0(vfs_exch, VFS_IN_CLONE, (sysarg_t) file_from,
+            (sysarg_t) file_to, (sysarg_t) high_descriptor);
         vfs_exchange_end(vfs_exch);
         return rc;