Changeset aeeaf0f in mainline

Timestamp:

2019-05-19T07:28:42Z (6 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a78cdcd

Parents:

6aeb60f (diff), 587867a (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.

git-author:

Jakub Jermář <jakub@…> (2019-05-19 07:28:42)

git-committer:

GitHub <noreply@…> (2019-05-19 07:28:42)

Message:

Merge pull request #163 from matthieuriolo/ticket_684_improved

Ticket 684 improved

Location:

uspace/app/bdsh

Files:

• compl.c (modified) (3 diffs)
• exec.c (modified) (3 diffs)
• util.c (modified) (1 diff)
• util.h (modified) (1 diff)

uspace/app/bdsh/compl.c

@@ -40 +40 @@
 #include "exec.h"
 #include "tok.h"
+#include "util.h"
 
 static errno_t compl_init(wchar_t *text, size_t pos, size_t *cstart, void **state);
@@ -209 +210 @@
                 }
                 *cstart += rpath_sep + 1 - prefix;
-                free(prefix);
-                prefix = NULL;
 
                 cs->path_list = malloc(sizeof(char *) * 2);
@@ -217 +216 @@
                         goto error;
                 }
-                cs->path_list[0] = dirname;
+
+                if (!is_path(prefix) && cs->is_command) {
+                        cs->path_list[0] = malloc(sizeof(char) * PATH_MAX);
+                        if (cs->path_list[0] == NULL) {
+                                retval = ENOMEM;
+                                goto error;
+                        }
+
+                        int ret = snprintf(cs->path_list[0], PATH_MAX, "%s/%s", search_dir[0], dirname);
+                        if (ret < 0 || ret >= PATH_MAX) {
+                                retval = ENOMEM;
+                                goto error;
+                        }
+                } else {
+                        cs->path_list[0] = dirname;
+                }
+
+                free(prefix);
                 cs->path_list[1] = NULL;
                 /*

uspace/app/bdsh/exec.c

@@ -47 +47 @@
 #include "errors.h"
 
-/* FIXME: Just have find_command() return an allocated string */
-static char *found;
-
-static char *find_command(char *);
+static errno_t find_command(char *, char **);
 static int try_access(const char *);
 
@@ -68 +65 @@
 }
 
-/** Returns the full path of "cmd" if cmd is found
+/** Returns EOK if no internal failure or else ENOMEM
  *
- * else just hand back cmd as it was presented
+ * 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
  */
-static char *find_command(char *cmd)
+static errno_t find_command(char *cmd, char **found)
 {
-        size_t i;
+        /* 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 = (char *)malloc(PATH_MAX);
+                *found = NULL;
+                return EOK;
+        }
 
-        /* The user has specified a full or relative path, just give it back. */
-        if (-1 != try_access(cmd)) {
-                return (char *) cmd;
+        *found = (char *)malloc(PATH_MAX);
+        if (*found == NULL) {
+                return ENOMEM;
         }
 
         /* 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++) {
-                memset(found, 0, PATH_MAX);
-                snprintf(found, PATH_MAX, "%s/%s", search_dir[i], cmd);
-                if (-1 != try_access(found)) {
-                        return (char *) found;
+                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;
                 }
         }
+        free(*found);
+        *found = NULL;
 
-        /* We didn't find it, just give it back as-is. */
-        return (char *) cmd;
+        /* We didn't find it, return NULL */
+        return EOK;
 }
 
@@ -107 +122 @@
         FILE *files[3];
 
-        tmp = str_dup(find_command(cmd));
-        free(found);
+        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;
+        }
 
         files[0] = io->stdin;

uspace/app/bdsh/util.c

@@ -74 +74 @@
         return 0;
 }
+
+/*
+ * Returns true if the string is a relative or an absolute path
+ */
+bool is_path(const char *cmd)
+{
+
+        bool ret = str_lcmp(cmd, "/", 1) == 0;
+        ret = ret || str_lcmp(cmd, "./", 2) == 0;
+        ret = ret || str_lcmp(cmd, "../", 3) == 0;
+
+        return ret;
+}

uspace/app/bdsh/util.h

@@ -31 +31 @@
 
 #include "scli.h"
+#include <stdbool.h>
 
 /* Utility functions */
 extern unsigned int cli_count_args(char **);
 extern unsigned int cli_set_prompt(cliuser_t *usr);
+extern bool is_path(const char *cmd);
 
 #endif