Merge branch 'busybox' into merge

4 files changed, 61 insertions, 45 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();
 }
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 55141e141..205044630 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -829,8 +829,6 @@ static unsigned path_parse(char ***p)
                 if (!tmp)
                         break;
                 tmp++;
-                if (*tmp == '\0')
-                        break;  /* :<empty> */
                 npth++;
         }
 
@@ -842,8 +840,6 @@ static unsigned path_parse(char ***p)
                 if (!tmp)
                         break;
                 *tmp++ = '\0'; /* ':' -> '\0' */
-                if (*tmp == '\0')
-                        break; /* :<empty> */
                 res[npth++] = tmp;
         }
         /* special case: "match subdirectories of the current directory" */
@@ -925,9 +921,7 @@ static NOINLINE unsigned complete_cmd_dir_file(const char *command, int type)
                 struct dirent *next;
                 struct stat st;
                 char *found;
-#if ENABLE_PLATFORM_MINGW32
-                char *lpath;
-#endif
+                const char *lpath;
 
                 if (paths[i] == NULL) { /* path_parse()'s last component? */
                         /* in PATH completion, current dir's subdir names
@@ -937,12 +931,11 @@ static NOINLINE unsigned complete_cmd_dir_file(const char *command, int type)
                         paths[i] = (char *)".";
                 }
 
+                lpath = *paths[i] ? paths[i] : ".";
 #if ENABLE_PLATFORM_MINGW32
-                lpath = auto_string(alloc_system_drive(paths[i]));
-                dir = opendir(lpath);
-#else
-                dir = opendir(paths[i]);
+                lpath = auto_string(alloc_system_drive(lpath));
 #endif
+                dir = opendir(lpath);
                 if (!dir)
                         continue; /* don't print an error */
 
@@ -957,11 +950,7 @@ static NOINLINE unsigned complete_cmd_dir_file(const char *command, int type)
                         if (strncmp(basecmd, name_found, baselen) != 0)
                                 continue; /* no */
 
-#if ENABLE_PLATFORM_MINGW32
                         found = concat_path_file(lpath, name_found);
-#else
-                        found = concat_path_file(paths[i], name_found);
-#endif
                         /* NB: stat() first so that we see is it a directory;
                          * but if that fails, use lstat() so that
                          * we still match dangling links */
diff --git a/libbb/platform.c b/libbb/platform.c
index 329b0237e..7913353e2 100644
--- a/libbb/platform.c
+++ b/libbb/platform.c
@@ -166,6 +166,18 @@ char* FAST_FUNC stpcpy(char *p, const char *to_add)
 }
 #endif
 
+#ifndef HAVE_STPNCPY
+char* FAST_FUNC stpncpy(char *p, const char *to_add, size_t n)
+{
+        while (n != 0 && (*p = *to_add) != '\0') {
+                p++;
+                to_add++;
+                n--;
+        }
+        return p;
+}
+#endif
+
 #ifndef HAVE_GETLINE
 ssize_t FAST_FUNC getline(char **lineptr, size_t *n, FILE *stream)
 {
diff --git a/libbb/vfork_daemon_rexec.c b/libbb/vfork_daemon_rexec.c
index 26e1776a4..885c19f1a 100644
--- a/libbb/vfork_daemon_rexec.c
+++ b/libbb/vfork_daemon_rexec.c
@@ -109,8 +109,13 @@ int FAST_FUNC run_nofork_applet(int applet_no, char **argv)
                 char *tmp_argv[argc+1];
                 memcpy(tmp_argv, argv, (argc+1) * sizeof(tmp_argv[0]));
                 applet_name = tmp_argv[0];
+
+                /* longjmp's (instead of returning) if --help is seen */
+                show_usage_if_dash_dash_help(applet_no, argv);
+
                 /* Finally we can call NOFORK applet's main() */
                 rc = applet_main[applet_no](argc, tmp_argv);
+
                 /* Important for shells: `which CMD` was failing */
                 fflush_all();
         } else {