Merge branch 'busybox' into merge

4 files changed, 37 insertions, 13 deletions

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 193a78e31..f53d74834 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -278,9 +278,14 @@ void lbb_prepare(const char *applet
          && strcmp(argv[1], "--help") == 0
          && !is_prefixed_with(applet, "busybox")
         ) {
-                /* Special case. POSIX says "test --help"
-                 * should be no different from e.g. "test --foo".  */
-                if (!ENABLE_TEST || strcmp(applet_name, "test") != 0)
+                /* Special cases. POSIX says "test --help"
+                 * should be no different from e.g. "test --foo".
+                 */
+                if (!(ENABLE_TEST && strcmp(applet_name, "test") == 0)
+                 && !(ENABLE_TRUE && strcmp(applet_name, "true") == 0)
+                 && !(ENABLE_FALSE && strcmp(applet_name, "false") == 0)
+                 && !(ENABLE_ECHO && strcmp(applet_name, "echo") == 0)
+                )
                         bb_show_usage();
         }
 #endif
@@ -1021,15 +1026,21 @@ int busybox_main(int argc UNUSED_PARAM, char **argv)
                 if (!argv[2])
                         goto help;
                 /* convert to "<applet> --help" */
-                argv[0] = argv[2];
+                applet_name = argv[0] = argv[2];
                 argv[2] = NULL;
+                if (find_applet_by_name(applet_name) >= 0) {
+                        /* Make "--help foo" exit with 0: */
+                        xfunc_error_retval = 0;
+                        bb_show_usage();
+                } /* else: unknown applet, fall through (causes "applet not found" later) */
         } else {
                 /* "busybox <applet> arg1 arg2 ..." */
                 argv++;
+                /* We support "busybox /a/path/to/applet args..." too. Allows for
+                 * "#!/bin/busybox"-style wrappers
+                 */
+                applet_name = bb_get_last_path_component_nostrip(argv[0]);
         }
-        /* We support "busybox /a/path/to/applet args..." too. Allows for
-         * "#!/bin/busybox"-style wrappers */
-        applet_name = bb_get_last_path_component_nostrip(argv[0]);
         run_applet_and_exit(applet_name, argv);
 }
 # endif
@@ -1040,7 +1051,7 @@ 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.
+         * "true", "false", "echo" are also special.
          */
         if (1
 #  if defined APPLET_NO_test
@@ -1052,6 +1063,9 @@ void FAST_FUNC show_usage_if_dash_dash_help(int applet_no, char **argv)
 #  if defined APPLET_NO_false
          && applet_no != APPLET_NO_false
 #  endif
+#  if defined APPLET_NO_echo
+         && applet_no != APPLET_NO_echo
+#  endif
 #  if ENABLE_PLATFORM_MINGW32 && defined APPLET_NO_busybox
          && applet_no != APPLET_NO_busybox
 #  endif
diff --git a/libbb/duration.c b/libbb/duration.c
index 086da15fb..a6a29ddae 100644
--- a/libbb/duration.c
+++ b/libbb/duration.c
@@ -37,8 +37,18 @@ duration_t FAST_FUNC parse_duration_str(char *str)
         if (strchr(str, '.')) {
                 double d;
                 char *pp;
-                int len = strspn(str, "0123456789.");
-                char sv = str[len];
+                int len;
+                char sv;
+
+# if ENABLE_LOCALE_SUPPORT
+                /* Undo busybox.c: on input, we want to use dot
+                 * as fractional separator in strtod(),
+                 * regardless of current locale
+                 */
+                setlocale(LC_NUMERIC, "C");
+# endif
+                len = strspn(str, "0123456789.");
+                sv = str[len];
                 str[len] = '\0';
                 errno = 0;
                 d = strtod(str, &pp);
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index c20436270..e7de32250 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -1157,7 +1157,7 @@ static NOINLINE int build_match_prefix(char *match_buf)
                 continue;
         for (--i; i >= 0; i--) {
                 int cur = int_buf[i];
-                if (cur == ' ' || cur == '<' || cur == '>' || cur == '|' || cur == '&') {
+                if (cur == ' ' || cur == '<' || cur == '>' || cur == '|' || cur == '&' || cur == '=') {
                         remove_chunk(int_buf, 0, i + 1);
                         break;
                 }
@@ -1426,7 +1426,7 @@ static NOINLINE void input_tab(smallint *lastWasTab)
                         strcpy(&command[cursor_mb], chosen_match + match_pfx_len);
                         len = load_string(command);
                         /* add match and tail */
-                        sprintf(&command[cursor_mb], "%s%s", chosen_match + match_pfx_len, match_buf);
+                        stpcpy(stpcpy(&command[cursor_mb], chosen_match + match_pfx_len), match_buf);
                         command_len = load_string(command);
                         /* write out the matched command */
                         /* paranoia: load_string can return 0 on conv error,
diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c
index 47dbdd1b6..d7d8b1092 100644
--- a/libbb/xfuncs_printf.c
+++ b/libbb/xfuncs_printf.c
@@ -226,7 +226,7 @@ int FAST_FUNC rename_or_warn(const char *oldpath, const char *newpath)
         return n;
 }
 
-void FAST_FUNC xpipe(int filedes[2])
+void FAST_FUNC xpipe(int *filedes)
 {
         if (pipe(filedes))
                 bb_simple_perror_msg_and_die("can't create pipe");