Merge branch 'busybox' into merge

1 files changed, 5 insertions, 3 deletions

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 99f0cb89c..a90d0cdb5 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -319,7 +319,6 @@ void lbb_prepare(const char *applet
         /* Redundant for busybox (run_applet_and_exit covers that case)
          * but needed for "individual applet" mode */
         if (argv[1]
-         && !argv[2]
          && strcmp(argv[1], "--help") == 0
          && !is_prefixed_with(applet, "busybox")
         ) {
@@ -1115,12 +1114,15 @@ void FAST_FUNC show_usage_if_dash_dash_help(int applet_no, char **argv)
 #  if defined APPLET_NO_echo
          && applet_no != APPLET_NO_echo
 #  endif
+#  if ENABLE_TEST1 || ENABLE_TEST2
+         && argv[0][0] != '[' /* exclude [ --help ] and [[ --help ]] too */
+#  endif
 #  if ENABLE_PLATFORM_MINGW32 && 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: */
+                if (argv[1] && strcmp(argv[1], "--help") == 0) {
+                        /* Make "foo --help [...]" exit with 0: */
                         xfunc_error_retval = 0;
                         bb_show_usage();
                 }