Merge branch 'busybox' into merge

1 files changed, 28 insertions, 4 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 3eb9d5852..28f4ec47d 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -10696,7 +10696,7 @@ evalpipe(union node *n, int flags)
 
 /* setinteractive needs this forward reference */
 #if ENABLE_FEATURE_TAB_COMPLETION
-static const char *get_builtin_name(int i) FAST_FUNC;
+static const char *ash_command_name(int i) FAST_FUNC;
 #endif
 
 /*
@@ -10733,7 +10733,7 @@ setinteractive(int on)
                 if (!line_input_state) {
                         line_input_state = new_line_input_t(FOR_SHELL | WITH_PATH_LOOKUP);
 # if ENABLE_FEATURE_TAB_COMPLETION
-                        line_input_state->get_exe_name = get_builtin_name;
+                        line_input_state->get_exe_name = ash_command_name;
 # endif
 # if EDITING_HAS_sh_get_var
                         line_input_state->sh_get_var = lookupvar;
@@ -11252,9 +11252,33 @@ find_builtin(const char *name)
 
 #if ENABLE_FEATURE_TAB_COMPLETION
 static const char * FAST_FUNC
-get_builtin_name(int i)
+ash_command_name(int i)
 {
-        return /*i >= 0 &&*/ i < ARRAY_SIZE(builtintab) ? builtintab[i].name + 1 : NULL;
+        int n;
+
+        if (/*i >= 0 &&*/ i < ARRAY_SIZE(builtintab))
+                return builtintab[i].name + 1;
+        i -= ARRAY_SIZE(builtintab);
+
+        for (n = 0; n < CMDTABLESIZE; n++) {
+                struct tblentry *cmdp;
+                for (cmdp = cmdtable[n]; cmdp; cmdp = cmdp->next) {
+                        if (cmdp->cmdtype == CMDFUNCTION && --i < 0)
+                                return cmdp->cmdname;
+                }
+        }
+
+# if ENABLE_ASH_ALIAS
+        for (n = 0; n < ATABSIZE; n++) {
+                struct alias *ap;
+                for (ap = atab[n]; ap; ap = ap->next) {
+                        if (--i < 0)
+                                return ap->name;
+                }
+        }
+#endif
+
+        return NULL;
 }
 #endif