Changes in uspace/app/bdsh/exec.c [aa8053f1:36ab7c7] in mainline

File:

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

uspace/app/bdsh/exec.c

@@ -52 +52 @@
 static int try_access(const char *);
 
-const char *search_dir[] = { "/app", "/srv", NULL };
-
 /* work-around for access() */
 static int try_access(const char *f)
@@ -71 +69 @@
 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);
@@ -80 +81 @@
         }
 
+        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;
                 }
@@ -90 +106 @@
 
         /* We didn't find it, just give it back as-is. */
+        free(path_tok);
         return (char *) cmd;
 }