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

Timestamp:

2019-07-05T18:37:31Z (5 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

fa603e99

Parents:

53afa639 (diff), 46288ee (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:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-07-05 18:37:31)

git-committer:

GitHub <noreply@…> (2019-07-05 18:37:31)

Message:

Merge pull request #135 from matthieuriolo/bdsh_alias

Implements alias/unalias commands in bdsh.

File:

• uspace/app/bdsh/compl.c (modified) (6 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"
@@ -63 +65 @@
         /** 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 */
@@ -243 +248 @@
         } else if (cs->is_command) {
                 /* Command without path */
+                cs->alias_link = odict_first(&alias_dict);
                 cs->module = modules;
                 cs->builtin = builtins;
@@ -321 +327 @@
         }
 
+        /* 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 +362 @@
                 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 +417 @@
                                 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 ? '/' : ' ');