Merge branch 'busybox' into mergeFRP

1 files changed, 13 insertions, 11 deletions

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 3f51ecef6..683d10b20 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -635,7 +635,7 @@ static int busybox_main(char **argv)
                 full_write2_str(bb_banner); /* reuse const string */
                 full_write2_str(" multi-call binary.\n"); /* reuse */
                 full_write2_str(
-                        "BusyBox is copyrighted by many authors between 1998-2012.\n"
+                        "BusyBox is copyrighted by many authors between 1998-2015.\n"
                         "Licensed under GPLv2. See source distribution for detailed\n"
                         "copyright notices.\n"
                         "\n"
@@ -761,23 +761,25 @@ void FAST_FUNC run_applet_no_and_exit(int applet_no, char **argv)
         xfunc_error_retval = EXIT_FAILURE;
         applet_name = APPLET_NAME(applet_no);
 
-#if defined APPLET_NO_test
         /* 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 (applet_no != APPLET_NO_test)
+        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 (argc == 2 && strcmp(argv[1], "--help") == 0) {
 #if defined APPLET_NO_false
-                        /* Someone insisted that "false --help" must exit 1. Sigh */
-                        if (applet_no != APPLET_NO_false)
+         && applet_no != APPLET_NO_false
 #endif
-                        {
-                                /* Make "foo --help" exit with 0: */
-                                xfunc_error_retval = 0;
-                        }
+        ) {
+                if (argc == 2 && strcmp(argv[1], "--help") == 0) {
+                        /* Make "foo --help" exit with 0: */
+                        xfunc_error_retval = 0;
                         bb_show_usage();
                 }
         }