Changes in uspace/app/bdsh/exec.c [9c4cf0d:6afc9d7] in mainline

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