Changeset aeeaf0f in mainline for uspace/app/bdsh/compl.c

Timestamp:

2019-05-19T07:28:42Z (5 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

File:

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

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;
                 /*