Changeset fcab7ef in mainline for uspace/srv/vfs/vfs_ops.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/srv/vfs/vfs_ops.c (modified) (3 diffs)

uspace/srv/vfs/vfs_ops.c

@@ -88 +88 @@
 }
 
-int vfs_op_clone(int oldfd, bool desc)
-{
+int vfs_op_clone(int oldfd, int newfd, bool desc)
+{
+        int rc;
+
+        /* If the file descriptors are the same, do nothing. */
+        if (oldfd == newfd)
+                return EOK;
+        
         /* Lookup the file structure corresponding to fd. */
         vfs_file_t *oldfile = vfs_file_get(oldfd);
@@ -96 +102 @@
 
         assert(oldfile->node != NULL);
-        
-        vfs_file_t *newfile;
-        int newfd = vfs_fd_alloc(&newfile, desc);
-        if (newfd >= 0) {
-                newfile->node = oldfile->node;
-                newfile->permissions = oldfile->permissions;
-                vfs_node_addref(newfile->node);
-        
-                vfs_file_put(newfile);
+
+        if (newfd != -1) {
+                /* Make sure newfd is closed. */
+                (void) vfs_fd_free(newfd);
+                /* Assign the old file to newfd. */
+                rc = vfs_fd_assign(oldfile, newfd);
+        } else {
+                vfs_file_t *newfile;
+                int newfd = vfs_fd_alloc(&newfile, desc);
+                if (newfd >= 0) {
+                        newfile->node = oldfile->node;
+                        newfile->permissions = oldfile->permissions;
+                        vfs_node_addref(newfile->node);
+        
+                        vfs_file_put(newfile);
+                }
+                rc = newfd;
         }
         vfs_file_put(oldfile);
         
-        return newfd;
+        return rc;
 }
 
@@ -114 +128 @@
 {
         return vfs_fd_free(fd);
-}
-
-int vfs_op_dup(int oldfd, int newfd)
-{
-        /* If the file descriptors are the same, do nothing. */
-        if (oldfd == newfd)
-                return EOK;
-        
-        /* Lookup the file structure corresponding to oldfd. */
-        vfs_file_t *oldfile = vfs_file_get(oldfd);
-        if (!oldfile)
-                return EBADF;
-        
-        /* Make sure newfd is closed. */
-        (void) vfs_fd_free(newfd);
-        
-        /* Assign the old file to newfd. */
-        int ret = vfs_fd_assign(oldfile, newfd);
-        vfs_file_put(oldfile);
-        
-        return ret;
 }