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

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/lib/c/generic

Files:

• elf/elf_mod.c (modified) (1 diff)
• io/io.c (modified) (3 diffs)
• vfs/vfs.c (modified) (4 diffs)

uspace/lib/c/generic/elf/elf_mod.c

@@ -96 +96 @@
         elf_ld_t elf;
 
-        int ofile = vfs_clone(file, true);
+        int ofile = vfs_clone(file, -1, true);
         int rc = _vfs_open(ofile, MODE_READ);
         if (rc != EOK) {

uspace/lib/c/generic/io/io.c

@@ -114 +114 @@
         int infd = inbox_get("stdin");
         if (infd >= 0) {
-                int stdinfd = vfs_clone(infd, false);
+                int stdinfd = vfs_clone(infd, -1, false);
                 assert(stdinfd == 0);
                 _vfs_open(stdinfd, MODE_READ);
@@ -125 +125 @@
         int outfd = inbox_get("stdout");
         if (outfd >= 0) {
-                int stdoutfd = vfs_clone(outfd, false);
+                int stdoutfd = vfs_clone(outfd, -1, false);
                 assert(stdoutfd <= 1);
-                while (stdoutfd < 1) {
-                        stdoutfd = vfs_clone(outfd, false);
-                }
+                while (stdoutfd < 1)
+                        stdoutfd = vfs_clone(outfd, -1, false);
                 _vfs_open(stdoutfd, MODE_APPEND);
                 stdout = fdopen(stdoutfd, "a");
@@ -139 +138 @@
         int errfd = inbox_get("stderr");
         if (errfd >= 0) {
-                int stderrfd = vfs_clone(errfd, false);
+                int stderrfd = vfs_clone(errfd, -1, false);
                 assert(stderrfd <= 2);
-                while (stderrfd < 2) {
-                        stderrfd = vfs_clone(errfd, false);
-                }
+                while (stderrfd < 2)
+                        stderrfd = vfs_clone(errfd, -1, false);
                 _vfs_open(stderrfd, MODE_APPEND);
                 stderr = fdopen(stderrfd, "a");

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;