1 files changed, 27 insertions, 7 deletions

diff --git a/shell/hush.c b/shell/hush.c
index 330a0aa79..443bdeccf 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -8220,15 +8220,35 @@ static const struct built_in_command *find_builtin(const char *name)
 }
 
 #if ENABLE_HUSH_JOB && ENABLE_FEATURE_TAB_COMPLETION
-static const char * FAST_FUNC hush_builtin_name(int i)
+static const char * FAST_FUNC hush_command_name(exe_state *e)
 {
-        if (/*i >= 0 && */ i < ARRAY_SIZE(bltins1)) {
-                return bltins1[i].b_cmd;
+        if (e->e_type == 0) {
+                if (/*e->e_index >= 0 && */ e->e_index < ARRAY_SIZE(bltins1)) {
+                        return bltins1[e->e_index++].b_cmd;
+                }
+                e->e_type++;
+                e->e_index = 0;
+                /* e->e_ptr = NULL; */
+        }
+        if (e->e_type == 1) {
+                if (e->e_index < ARRAY_SIZE(bltins2)) {
+                        return bltins2[e->e_index++].b_cmd;
+                }
+# if ENABLE_HUSH_FUNCTIONS
+                e->e_type++;
+                /* e->e_index = 0; */
+                e->e_ptr = G.top_func;
+# endif
         }
-        i -= ARRAY_SIZE(bltins1);
-        if (i < ARRAY_SIZE(bltins2)) {
-                return bltins2[i].b_cmd;
+# if ENABLE_HUSH_FUNCTIONS
+        if (e->e_type == 2) {
+                struct function *funcp = (struct function *)e->e_ptr;
+                while (funcp) {
+                        e->e_ptr = funcp->next;
+                        return funcp->name;
+                }
         }
+# endif
         return NULL;
 }
 #endif
@@ -10716,7 +10736,7 @@ int hush_main(int argc, char **argv)
 # if ENABLE_FEATURE_EDITING
                 G.line_input_state = new_line_input_t(FOR_SHELL);
 #  if ENABLE_FEATURE_TAB_COMPLETION
-                G.line_input_state->get_exe_name = hush_builtin_name;
+                G.line_input_state->get_exe_name = hush_command_name;
 #  endif
 #  if EDITING_HAS_sh_get_var
                 G.line_input_state->sh_get_var = get_local_var_value;