hush: code shrinktab_completion

Handle both arrays of builtin as the same type.

function                                             old     new   delta
ash_command_name                                       -     154    +154
hush_command_name                                      -      97     +97
complete_cmd_dir_file                                876     880      +4
ash_builtin_name                                      17       -     -17
hush_builtin_name                                     38       -     -38
------------------------------------------------------------------------------
(add/remove: 2/2 grow/shrink: 1/0 up/down: 255/-55)           Total: 200 bytes

In the case where ash is disabled and hush is enabled but with support
for functions disabled this reduces the bloat from 31 to 6 bytes.

(GitHub issue #301)

Signed-off-by: Ron Yorston <rmy@pobox.com>

3 files changed, 9 insertions, 11 deletions

diff --git a/include/libbb.h b/include/libbb.h
index 66781da4f..f4fc10325 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1925,9 +1925,9 @@ unsigned size_from_HISTFILESIZE(const char *hp) FAST_FUNC;
 #  define MAX_HISTORY 0
 # endif
 typedef struct exe_state {
-        int e_type;             /* type of tab completion:  builtin, alias, function */
         int e_index;    /* index of current table entry or hash bucket */
 # if ENABLE_SHELL_ASH || (ENABLE_SHELL_HUSH && ENABLE_HUSH_FUNCTIONS)
+        int e_type;             /* type of tab completion:  builtin, alias, function */
         void *e_ptr;    /* current position in linked list */
 # endif
 } exe_state;
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 5daceff16..d3882b33f 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -878,7 +878,7 @@ static NOINLINE unsigned complete_cmd_dir_file(const char *command, int type)
 #  if ENABLE_SHELL_ASH || (ENABLE_SHELL_HUSH && ENABLE_HUSH_FUNCTIONS)
                         exe_state e = { 0, 0, NULL };
 #  else
-                        exe_state e = { 0, 0 };
+                        exe_state e = { 0 };
 #  endif
                         for (;;) {
                                 const char *b = state->get_exe_name(&e);
diff --git a/shell/hush.c b/shell/hush.c
index 04633ab2d..12c32ce6e 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -8222,31 +8222,29 @@ 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_command_name(exe_state *e)
 {
+# if ENABLE_HUSH_FUNCTIONS
         switch (e->e_type) {
         case 0:
+# endif
                 if (e->e_index < ARRAY_SIZE(bltins1))
                         return bltins1[e->e_index++].b_cmd;
-                e->e_type++;
-                e->e_index = 0;
-                /* e->e_ptr = NULL; */
-                /* fall through */
-        case 1:
-                if (e->e_index < ARRAY_SIZE(bltins2))
-                        return bltins2[e->e_index++].b_cmd;
+                if (e->e_index < ARRAY_SIZE(bltins1) + ARRAY_SIZE(bltins2))
+                        return bltins2[e->e_index++ - ARRAY_SIZE(bltins1)].b_cmd;
 # if ENABLE_HUSH_FUNCTIONS
+                /* fall through */
                 e->e_type++;
                 /* e->e_index = 0; */
                 e->e_ptr = G.top_func;
                 /* fall through */
-        case 2:
+        case 1:
                 if (e->e_ptr) {
                         struct function *funcp = (struct function *)e->e_ptr;
                         e->e_ptr = funcp->next;
                         return funcp->name;
                 }
-# endif
                 break;
         }
+# endif
         return NULL;
 }
 #endif