3 files changed, 7 insertions, 6 deletions

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index de654f64c..b682e6b85 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -791,7 +791,8 @@ static int busybox_main(char **argv)
                         full_write2_str(a);
                         full_write2_str("\n");
                         i++;
-                        a += strlen(a) + 1;
+                        while (*a++ != '\0')
+                                continue;
                 }
                 return 0;
         }
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 2ddb2b6e9..3e62f46b4 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -779,12 +779,11 @@ static NOINLINE unsigned complete_cmd_dir_file(const char *command, int type)
         if (type == FIND_EXE_ONLY) {
                 const char *p = applet_names;
 
-                i = 0;
-                while (i < NUM_APPLETS) {
+                while (*p) {
                         if (strncmp(pfind, p, pf_len) == 0)
                                 add_match(xstrdup(p));
-                        p += strlen(p) + 1;
-                        i++;
+                        while (*p++ != '\0')
+                                continue;
                 }
         }
 #endif
diff --git a/shell/ash.c b/shell/ash.c
index 5613e1f33..13eeab34b 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -12597,7 +12597,8 @@ helpcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                                 out1fmt("\n");
                                 col = 0;
                         }
-                        a += strlen(a) + 1;
+                        while (*a++ != '\0')
+                                continue;
                 }
         }
 # endif