Changes in uspace/app/bdsh/exec.c [c4a8e4a:7e752b2] in mainline

File:

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

uspace/app/bdsh/exec.c

@@ -1 @@
-/*
- * Copyright (c) 2008 Tim Post
+/* Copyright (c) 2008, Tim Post <tinkertim@gmail.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
+ * modification, are permitted provided that the following conditions are met:
  *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
  *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of the original program's authors nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
  */
 
@@ -40 +42 @@
 #include <str_error.h>
 #include <errno.h>
-#include <vfs/vfs.h>
 
 #include "config.h"
@@ -52 +53 @@
 static char *find_command(char *);
 static int try_access(const char *);
-
-const char *search_dir[] = { "/app", "/srv", NULL };
 
 /* work-around for access() */
@@ -72 +71 @@
 static char *find_command(char *cmd)
 {
-        size_t i;
+        char *path_tok;
+        char *path[PATH_MAX];
+        int n = 0, i = 0;
+        size_t x = str_size(cmd) + 2;
 
         found = (char *)malloc(PATH_MAX);
@@ -81 +83 @@
         }
 
+        path_tok = str_dup(PATH);
+
+        /* Extract the PATH env to a path[] array */
+        path[n] = strtok(path_tok, PATH_DELIM);
+        while (NULL != path[n]) {
+                if ((str_size(path[n]) + x ) > PATH_MAX) {
+                        cli_error(CL_ENOTSUP,
+                                "Segment %d of path is too large, search ends at segment %d",
+                                n, n-1);
+                        break;
+                }
+                path[++n] = strtok(NULL, PATH_DELIM);
+        }
+
         /* We now have n places to look for the command */
-        for (i = 0; search_dir[i] != NULL; i++) {
+        for (i=0; path[i]; i++) {
                 memset(found, 0, sizeof(found));
-                snprintf(found, PATH_MAX, "%s/%s", search_dir[i], cmd);
+                snprintf(found, PATH_MAX, "%s/%s", path[i], cmd);
                 if (-1 != try_access(found)) {
+                        free(path_tok);
                         return (char *) found;
                 }
@@ -91 +108 @@
 
         /* We didn't find it, just give it back as-is. */
+        free(path_tok);
         return (char *) cmd;
 }
 
-unsigned int try_exec(char *cmd, char **argv, iostate_t *io)
+unsigned int try_exec(char *cmd, char **argv)
 {
         task_id_t tid;
         task_exit_t texit;
         char *tmp;
-        int rc, retval, i;
-        int file_handles[3];
-        int *file_handles_p[4];
-        FILE *files[3];
+        int rc, retval;
 
         tmp = str_dup(find_command(cmd));
         free(found);
-        
-        files[0] = io->stdin;
-        files[1] = io->stdout;
-        files[2] = io->stderr;
-        
-        for (i = 0; i < 3 && files[i] != NULL; i++) {
-                if (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, tmp, (const char **) argv, file_handles_p);
+        rc = task_spawnv(&tid, tmp, (const char **) argv);
         free(tmp);
 
@@ -134 +135 @@
                 printf("%s: Failed waiting for command (%s)\n", progname,
                     str_error(rc));
-                return 1;
         } else if (texit != TASK_EXIT_NORMAL) {
                 printf("%s: Command failed (unexpectedly terminated)\n", progname);
-                return 1;
         } else if (retval != 0) {
                 printf("%s: Command failed (exit code %d)\n",
                     progname, retval);
-                return 1;
         }