Changeset 4069f5c in mainline for uspace/app/bdsh/exec.c

Timestamp:

2011-07-17T09:52:42Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

64639256, ca1f1ec

Parents:

27eddb52 (diff), 4118f5f (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 mainline changes.

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)
@@ -69 +71 @@
 static char *find_command(char *cmd)
 {
-        char *path_tok;
-        char *path[PATH_MAX];
-        int n = 0, i = 0;
-        size_t x = str_size(cmd) + 2;
+        size_t i;
 
         found = (char *)malloc(PATH_MAX);
@@ -81 +80 @@
         }
 
-        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; path[i]; i++) {
+        for (i = 0; search_dir[i] != NULL; i++) {
                 memset(found, 0, sizeof(found));
-                snprintf(found, PATH_MAX, "%s/%s", path[i], cmd);
+                snprintf(found, PATH_MAX, "%s/%s", search_dir[i], cmd);
                 if (-1 != try_access(found)) {
-                        free(path_tok);
                         return (char *) found;
                 }
@@ -106 +90 @@
 
         /* We didn't find it, just give it back as-is. */
-        free(path_tok);
         return (char *) cmd;
 }