Changeset 1c481ee in mainline

Timestamp:

2019-03-09T15:40:05Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

587867a

Parents:

c56a3eb

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-03-02 15:55:07)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-03-09 15:40:05)

Message:

This commit fixes #684 and adds autocompletion for subdirectories in search_path. 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()

This commit also fixes the problem, that subdirectories inside the
search_path would not be autocomplete. BDSH would execute such paths.
The reason being is that such paths was interpreted as relative paths.
Now BDSH makes a distinction between relatives paths or paths inside
search_path

Location:

uspace/app/bdsh

Files:

• compl.c (modified) (3 diffs)
• exec.c (modified) (1 diff)
• 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);
+                        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;
+                }
+
                 cs->path_list[1] = NULL;
                 /*

uspace/app/bdsh/exec.c

@@ -72 +72 @@
 {
         /* The user has specified a full or relative path, just give it back. */
-        if (-1 != try_access(cmd)) {
-                return str_dup(cmd);
+        if (is_path(cmd)) {
+                if (-1 != try_access(cmd)) {
+                        return str_dup(cmd);
+                }
         }
 

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