Merge branch 'busybox' into merge

1 files changed, 40 insertions, 30 deletions

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 1587cf36f..846417d59 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -1034,6 +1034,34 @@ int busybox_main(int argc UNUSED_PARAM, char **argv)
 # endif
 
 # if NUM_APPLETS > 0
+void FAST_FUNC show_usage_if_dash_dash_help(int applet_no, char **argv)
+{
+        /* Special case. POSIX says "test --help"
+         * should be no different from e.g. "test --foo".
+         * Thus for "test", we skip --help check.
+         * "true" and "false" are also special.
+         */
+        if (1
+#  if defined APPLET_NO_test
+         && applet_no != APPLET_NO_test
+#  endif
+#  if defined APPLET_NO_true
+         && applet_no != APPLET_NO_true
+#  endif
+#  if defined APPLET_NO_false
+         && applet_no != APPLET_NO_false
+#  endif
+#  if defined APPLET_NO_busybox
+         && applet_no != APPLET_NO_busybox
+#  endif
+        ) {
+                if (argv[1] && !argv[2] && strcmp(argv[1], "--help") == 0) {
+                        /* Make "foo --help" exit with 0: */
+                        xfunc_error_retval = 0;
+                        bb_show_usage();
+                }
+        }
+}
 
 #  if ENABLE_PLATFORM_MINGW32
 static int interp = 0;
@@ -1043,11 +1071,13 @@ char bb_command_line[128];
 
 void FAST_FUNC run_applet_no_and_exit(int applet_no, const char *name, char **argv)
 {
-        int argc = string_array_len(argv);
 #  if ENABLE_PLATFORM_MINGW32
+        int argc = string_array_len(argv);
         int i;
         const char *vmask;
         unsigned int mask;
+#  else
+        int argc;
 #  endif
 
         /*
@@ -1055,6 +1085,12 @@ void FAST_FUNC run_applet_no_and_exit(int applet_no, const char *name, char **ar
          * "-/sbin/halt" -> "halt", for example.
          */
         applet_name = name;
+
+        show_usage_if_dash_dash_help(applet_no, argv);
+
+        if (ENABLE_FEATURE_SUID)
+                check_suid(applet_no);
+
 #  if ENABLE_PLATFORM_MINGW32
         safe_strncpy(bb_comm,
                                         interp ? bb_basename(argv[interp]) : applet_name,
@@ -1069,37 +1105,11 @@ void FAST_FUNC run_applet_no_and_exit(int applet_no, const char *name, char **ar
         vmask = getenv("BB_UMASK");
         if (vmask && sscanf(vmask, "%o", &mask) == 1)
                 umask((mode_t)(mask&0777));
+#  else
+        argc = string_array_len(argv);
 #  endif
-
-        /* Special case. POSIX says "test --help"
-         * should be no different from e.g. "test --foo".
-         * Thus for "test", we skip --help check.
-         * "true" and "false" are also special.
-         */
-        if (1
-#  if defined APPLET_NO_test
-         && applet_no != APPLET_NO_test
-#  endif
-#  if defined APPLET_NO_true
-         && applet_no != APPLET_NO_true
-#  endif
-#  if defined APPLET_NO_false
-         && applet_no != APPLET_NO_false
-#  endif
-#  if defined APPLET_NO_busybox
-         && applet_no != APPLET_NO_busybox
-#  endif
-        ) {
-                if (argc == 2 && strcmp(argv[1], "--help") == 0) {
-                        /* Make "foo --help" exit with 0: */
-                        xfunc_error_retval = 0;
-                        bb_show_usage();
-                }
-        }
-        if (ENABLE_FEATURE_SUID)
-                check_suid(applet_no);
-
         xfunc_error_retval = applet_main[applet_no](argc, argv);
+
         /* Note: applet_main() may also not return (die on a xfunc or such) */
         xfunc_die();
 }