Changes in uspace/app/bdsh/exec.c [587867a:31872f7] in mainline

File:

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

uspace/app/bdsh/exec.c

@@ -47 +47 @@
 #include "errors.h"
 
-static errno_t find_command(char *, char **);
+/* FIXME: Just have find_command() return an allocated string */
+static char *found;
+
+static char *find_command(char *);
 static int try_access(const char *);
 
@@ -65 +68 @@
 }
 
-/** Returns EOK if no internal failure or else ENOMEM
+/** Returns the full path of "cmd" if cmd is found
  *
- * When the parameter `cmd` can be found then the absolute path will be set in `found`.
- * Or else `found` will be NULL.
- * `found` will be newly allocated and must be freed by the caller
+ * else just hand back cmd as it was presented
  */
-static errno_t find_command(char *cmd, char **found)
+static char *find_command(char *cmd)
 {
+        size_t i;
+
+        found = (char *)malloc(PATH_MAX);
+
         /* The user has specified a full or relative path, just give it back. */
-        if (is_path(cmd)) {
-                if (-1 != try_access(cmd)) {
-                        *found = str_dup(cmd);
-                        return EOK;
-                }
-
-                *found = NULL;
-                return EOK;
-        }
-
-        *found = (char *)malloc(PATH_MAX);
-        if (*found == NULL) {
-                return ENOMEM;
+        if (-1 != try_access(cmd)) {
+                return (char *) cmd;
         }
 
         /* We now have n places to look for the command */
-        size_t i;
-        size_t cmd_length = str_length(cmd);
         for (i = 0; search_dir[i] != NULL; i++) {
-                if (str_length(search_dir[i]) + cmd_length + 2 > PATH_MAX) {
-                        free(*found);
-                        return ENOMEM;
-                }
-
-                memset(*found, 0, PATH_MAX);
-                snprintf(*found, PATH_MAX, "%s/%s", search_dir[i], cmd);
-                if (-1 != try_access(*found)) {
-                        return EOK;
+                memset(found, 0, PATH_MAX);
+                snprintf(found, PATH_MAX, "%s/%s", search_dir[i], cmd);
+                if (-1 != try_access(found)) {
+                        return (char *) found;
                 }
         }
-        free(*found);
-        *found = NULL;
 
-        /* We didn't find it, return NULL */
-        return EOK;
+        /* We didn't find it, just give it back as-is. */
+        return (char *) cmd;
 }
 
@@ -122 +107 @@
         FILE *files[3];
 
-        rc = find_command(cmd, &tmp);
-        if (rc != EOK) {
-                cli_error(CL_ENOMEM, "%s: failure executing find_command()", progname);
-                return 1;
-        }
-
-        if (tmp == NULL) {
-                cli_error(CL_EEXEC, "%s: Command not found '%s'", progname, cmd);
-                return 1;
-        }
+        tmp = str_dup(find_command(cmd));
+        free(found);
 
         files[0] = io->stdin;