Changeset 368ee04 in mainline for uspace/app/bdsh/exec.c

Timestamp:

2017-04-05T18:10:39Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

93ad8166

Parents:

39f892a9 (diff), 2166728 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/vfs-2.5-cherrypick

This merge cherry-picks some of the changesets from Jiri Zarevucky's:

lp:~zarevucky-jiri/helenos/vfs-2.5

and then continues independently, yet sometime in a similar vein.

Roughly speaking, Jiri's branch is merged entirely up to its revision
1926 and then cherry-picked on and off until its revision 1965. Among
these changes are:

• relativization of the API,
• client-side roots,
• server-side mounts,
• inbox for passing arbitrary files from parent to child,
• some streamlining and cleanup.

Additional changes include:

• addressing issues introduced by the above changes,
• client-side I/O cursors (file positions),
• all HelenOS file system APIs begin with the vfs_ prefix and can be used after including vfs/vfs.h,
• removal of some POSIX-ish headers and definitions,
• additional cleanup.

File:

• uspace/app/bdsh/exec.c (modified) (4 diffs)

uspace/app/bdsh/exec.c

@@ -37 +37 @@
 #include <unistd.h>
 #include <str.h>
-#include <fcntl.h>
 #include <str_error.h>
 #include <errno.h>
@@ -60 +59 @@
         int fd;
 
-        fd = open(f, O_RDONLY);
+        fd = vfs_lookup_open(f, WALK_REGULAR, MODE_READ);
         if (fd >= 0) {
-                close(fd);
+                vfs_put(fd);
                 return 0;
         } else
@@ -101 +100 @@
         char *tmp;
         int rc, retval, i;
-        int file_handles[3];
-        int *file_handles_p[4];
+        int file_handles[3] = { -1, -1, -1 };
         FILE *files[3];
 
@@ -113 +111 @@
         
         for (i = 0; i < 3 && files[i] != NULL; i++) {
-                if (vfs_fhandle(files[i], &file_handles[i]) == EOK) {
-                        file_handles_p[i] = &file_handles[i];
-                }
-                else {
-                        file_handles_p[i] = NULL;
-                }
+                vfs_fhandle(files[i], &file_handles[i]);
         }
-        file_handles_p[i] = NULL;
 
-        rc = task_spawnvf(&tid, &twait, tmp, (const char **) argv, file_handles_p);
+        rc = task_spawnvf(&tid, &twait, tmp, (const char **) argv,
+            file_handles[0], file_handles[1], file_handles[2]);
         free(tmp);