Changes in uspace/app/bdsh/compl.c [587867a:ac2caecb] in mainline

File:

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

uspace/app/bdsh/compl.c

@@ -35 +35 @@
 #include <vfs/vfs.h>
 #include <str.h>
-
+#include <adt/odict.h>
+
+#include "scli.h"
 #include "cmds/cmds.h"
 #include "compl.h"
 #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);
@@ -63 +64 @@
         /** Length of string prefix (number of characters) */
         size_t prefix_len;
+
+        /* Pointer to the current alias */
+        odlink_t *alias_link;
 
         /** Pointer inside list of modules */
@@ -210 +214 @@
                 }
                 *cstart += rpath_sep + 1 - prefix;
+                free(prefix);
+                prefix = NULL;
 
                 cs->path_list = malloc(sizeof(char *) * 2);
@@ -216 +222 @@
                         goto error;
                 }
-
-                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[0] = dirname;
                 cs->path_list[1] = NULL;
                 /*
@@ -243 +232 @@
         } else if (cs->is_command) {
                 /* Command without path */
+                cs->alias_link = odict_first(&alias_dict);
                 cs->module = modules;
                 cs->builtin = builtins;
@@ -321 +311 @@
         }
 
+        /* Alias */
+        if (cs->alias_link != NULL) {
+                while (*compl == NULL && cs->alias_link != NULL) {
+                        alias_t *data = odict_get_instance(cs->alias_link, alias_t, odict);
+                        if (compl_match_prefix(cs, data->name)) {
+                                asprintf(compl, "%s ", data->name);
+                                cs->last_compl = *compl;
+                                if (*compl == NULL)
+                                        return ENOMEM;
+                        }
+                        cs->alias_link = odict_next(cs->alias_link, &alias_dict);
+                }
+        }
+
         /* Modules */
         if (cs->module != NULL) {
                 while (*compl == NULL && cs->module->name != NULL) {
+                        /* prevents multiple listing of an overriden cmd */
                         if (compl_match_prefix(cs, cs->module->name)) {
-                                asprintf(compl, "%s ", cs->module->name);
-                                cs->last_compl = *compl;
-                                if (*compl == NULL)
-                                        return ENOMEM;
+                                odlink_t *alias_link = odict_find_eq(&alias_dict, (void *)cs->module->name, NULL);
+                                if (alias_link == NULL) {
+                                        asprintf(compl, "%s ", cs->module->name);
+                                        cs->last_compl = *compl;
+                                        if (*compl == NULL)
+                                                return ENOMEM;
+                                }
                         }
                         cs->module++;
@@ -338 +346 @@
                 while (*compl == NULL && cs->builtin->name != NULL) {
                         if (compl_match_prefix(cs, cs->builtin->name)) {
-                                asprintf(compl, "%s ", cs->builtin->name);
-                                cs->last_compl = *compl;
-                                if (*compl == NULL)
-                                        return ENOMEM;
+                                /* prevents multiple listing of an overriden cmd */
+                                odlink_t *alias_link = odict_find_eq(&alias_dict, (void *)cs->module->name, NULL);
+                                if (alias_link == NULL) {
+                                        asprintf(compl, "%s ", cs->builtin->name);
+                                        cs->last_compl = *compl;
+                                        if (*compl == NULL)
+                                                return ENOMEM;
+                                }
                         }
                         cs->builtin++;
@@ -389 +401 @@
                                 free(ent_path);
 
+                                /* prevents multiple listing of an overriden cmd */
+                                if (cs->is_command && !ent_stat.is_directory) {
+                                        odlink_t *alias_link = odict_find_eq(&alias_dict, (void *)dent->d_name, NULL);
+                                        if (alias_link != NULL) {
+                                                continue;
+                                        }
+                                }
+                                
                                 asprintf(compl, "%s%c", dent->d_name,
                                     ent_stat.is_directory ? '/' : ' ');