Changeset fcab7ef in mainline for uspace/srv/vfs

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()

Location:

uspace/srv/vfs

Files:

• vfs.h (modified) (1 diff)
• vfs_file.c (modified) (1 diff)
• vfs_ipc.c (modified) (3 diffs)
• vfs_ops.c (modified) (3 diffs)

uspace/srv/vfs/vfs.h

@@ -204 +204 @@
 extern int vfs_open_node_remote(vfs_node_t *);
 
-extern int vfs_op_clone(int oldfd, bool desc);
+extern int vfs_op_clone(int oldfd, int newfd, bool desc);
 extern int vfs_op_close(int fd);
-extern int vfs_op_dup(int oldfd, int newfd);
 extern int vfs_op_fstat(int fd);
 extern int vfs_op_mount(int mpfd, unsigned servid, unsigned flags, unsigned instance, const char *opts, const char *fsname, int *outfd);

uspace/srv/vfs/vfs_file.c

@@ -304 +304 @@
 
         fibril_mutex_lock(&VFS_DATA->lock);     
-        if ((fd < 0) || (fd >= MAX_OPEN_FILES) || (FILES[fd] != NULL)) {
+        if ((fd < 0) || (fd >= MAX_OPEN_FILES)) {
                 fibril_mutex_unlock(&VFS_DATA->lock);
-                return EINVAL;
+                return EBADF;
+        }
+        if (FILES[fd] != NULL) {
+                fibril_mutex_unlock(&VFS_DATA->lock);
+                return EEXIST;
         }
         

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);

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;
 }