Changeset e70f1ae in mainline for uspace/app/bdsh/exec.c

Timestamp:

2018-12-29T20:09:49Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Parents:

96e9434

Message:

Preventing find_command() to find cmds without a './' prefix

This commit fixes #684. The original implementation of find_command()
will find cmd inside the working directory even without
the prefix './'. However, those cmds would have not been visible in
the auto completion. This commit prevents this from happening.

The problem can be traced back to vfs_absolutize() which treats paths
without the './' prefix as relative paths. The changes made unsures
that only relative or absolute pathes will be passed to vfs_absolutize()

File:

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

uspace/app/bdsh/exec.c

@@ -66 +66 @@
 
 /** Returns the full path of "cmd" if cmd is found
- *
- * else just hand back cmd as it was presented
+ * or null if the cmd cannot be found
  */
 static char *find_command(char *cmd)
@@ -74 +73 @@
 
         /* The user has specified a full or relative path, just give it back. */
-        if (-1 != try_access(cmd)) {
-                return str_dup(cmd);
+        size_t len = str_length(cmd);
+        if ((len > 1 && cmd[0] == '/') || (len > 2 && cmd[0] == '.' && cmd[1] == '/')) {
+                if (-1 != try_access(cmd)) {
+                        return str_dup(cmd);
+                }
         }
 
@@ -89 +91 @@
         free(found);
 
-        /* We didn't find it, just give it back as-is. */
-        return str_dup(cmd);
+        /* We didn't find it, return NULL */
+        return NULL;
 }
 
@@ -105 +107 @@
 
         tmp = find_command(cmd);
+        if (tmp == NULL) {
+                cli_error(CL_EEXEC, "%s: Command not found '%s'", progname, cmd);
+                return 1;
+        }
 
         files[0] = io->stdin;