Merge branch 'busybox' into merge

Conflicts:
	coreutils/od_bloaty.c
	libbb/lineedit.c

1 files changed, 4 insertions, 4 deletions

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index dba66cc93..3f51ecef6 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -197,7 +197,7 @@ void lbb_prepare(const char *applet
         if (argv[1]
          && !argv[2]
          && strcmp(argv[1], "--help") == 0
-         && strncmp(applet, "busybox", 7) != 0
+         && !is_prefixed_with(applet, "busybox")
         ) {
                 /* Special case. POSIX says "test --help"
                  * should be no different from e.g. "test --foo".  */
@@ -686,7 +686,7 @@ static int busybox_main(char **argv)
                 return 0;
         }
 
-        if (strncmp(argv[1], "--list", 6) == 0) {
+        if (is_prefixed_with(argv[1], "--list")) {
                 unsigned i = 0;
                 const char *a = applet_names;
                 dup2(1, 2);
@@ -791,7 +791,7 @@ void FAST_FUNC run_applet_and_exit(const char *name, char **argv)
         int applet = find_applet_by_name(name);
         if (applet >= 0)
                 run_applet_no_and_exit(applet, argv);
-        if (strncmp(name, "busybox", 7) == 0)
+        if (is_prefixed_with(name, "busybox"))
                 exit(busybox_main(argv));
 }
 
@@ -842,7 +842,7 @@ int main(int argc UNUSED_PARAM, char **argv)
 
 #if defined(SINGLE_APPLET_MAIN)
         /* Only one applet is selected in .config */
-        if (argv[1] && strncmp(argv[0], "busybox", 7) == 0) {
+        if (argv[1] && is_prefixed_with(argv[0], "busybox")) {
                 /* "busybox <applet> <params>" should still work as expected */
                 argv++;
         }