Merge branch 'busybox' into merge

3 files changed, 49 insertions, 69 deletions

diff --git a/debianutils/run_parts.c b/debianutils/run_parts.c
index c6a90a486..e4d61df35 100644
--- a/debianutils/run_parts.c
+++ b/debianutils/run_parts.c
@@ -159,10 +159,15 @@ static const char runparts_longopts[] ALIGN1 =
         "reverse\0" No_argument       "\xf0"
         "test\0"    No_argument       "\xf1"
         "exit-on-error\0" No_argument "\xf2"
-#if ENABLE_FEATURE_RUN_PARTS_FANCY
+# if ENABLE_FEATURE_RUN_PARTS_FANCY
         "list\0"    No_argument       "\xf3"
-#endif
+# endif
         ;
+# define GETOPT32 getopt32long
+# define LONGOPTS ,runparts_longopts
+#else
+# define GETOPT32 getopt32
+# define LONGOPTS
 #endif
 
 int run_parts_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -175,12 +180,10 @@ int run_parts_main(int argc UNUSED_PARAM, char **argv)
 
         INIT_G();
 
-#if ENABLE_FEATURE_RUN_PARTS_LONG_OPTIONS
-        applet_long_options = runparts_longopts;
-#endif
         /* We require exactly one argument: the directory name */
-        opt_complementary = "=1";
-        getopt32(argv, "a:*u:", &arg_list, &umask_p);
+        GETOPT32(argv, "^" "a:*u:" "\0" "=1" LONGOPTS,
+                        &arg_list, &umask_p
+        );
 
         umask(xstrtou_range(umask_p, 8, 0, 07777));
 
diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c
index 9d60b2c7f..c8b7fa8f2 100644
--- a/debianutils/start_stop_daemon.c
+++ b/debianutils/start_stop_daemon.c
@@ -79,6 +79,7 @@ Misc options:
 //config:       -N|--nicelevel N
 
 //applet:IF_START_STOP_DAEMON(APPLET_ODDNAME(start-stop-daemon, start_stop_daemon, BB_DIR_SBIN, BB_SUID_DROP, start_stop_daemon))
+/* not NOEXEC: uses bb_common_bufsiz1 */
 
 //kbuild:lib-$(CONFIG_START_STOP_DAEMON) += start_stop_daemon.o
 
@@ -86,44 +87,15 @@ Misc options:
 //usage:       "[OPTIONS] [-S|-K] ... [-- ARGS...]"
 //usage:#define start_stop_daemon_full_usage "\n\n"
 //usage:       "Search for matching processes, and then\n"
-//usage:       "-K: stop all matching processes.\n"
-//usage:       "-S: start a process unless a matching process is found.\n"
-//usage:        IF_FEATURE_START_STOP_DAEMON_LONG_OPTIONS(
-//usage:     "\nProcess matching:"
-//usage:     "\n        -u,--user USERNAME|UID  Match only this user's processes"
-//usage:     "\n        -n,--name NAME          Match processes with NAME"
-//usage:     "\n                                in comm field in /proc/PID/stat"
-//usage:     "\n        -x,--exec EXECUTABLE    Match processes with this command"
-//usage:     "\n                                in /proc/PID/{exe,cmdline}"
-//usage:     "\n        -p,--pidfile FILE       Match a process with PID from the file"
-//usage:     "\n        All specified conditions must match"
-//usage:     "\n-S only:"
-//usage:     "\n        -x,--exec EXECUTABLE    Program to run"
-//usage:     "\n        -a,--startas NAME       Zeroth argument"
-//usage:     "\n        -b,--background         Background"
-//usage:        IF_FEATURE_START_STOP_DAEMON_FANCY(
-//usage:     "\n        -N,--nicelevel N        Change nice level"
-//usage:        )
-//usage:     "\n        -c,--chuid USER[:[GRP]] Change to user/group"
-//usage:     "\n        -m,--make-pidfile       Write PID to the pidfile specified by -p"
-//usage:     "\n-K only:"
-//usage:     "\n        -s,--signal SIG         Signal to send"
-//usage:     "\n        -t,--test               Match only, exit with 0 if a process is found"
-//usage:     "\nOther:"
-//usage:        IF_FEATURE_START_STOP_DAEMON_FANCY(
-//usage:     "\n        -o,--oknodo             Exit with status 0 if nothing is done"
-//usage:     "\n        -v,--verbose            Verbose"
-//usage:        )
-//usage:     "\n        -q,--quiet              Quiet"
-//usage:        )
-//usage:        IF_NOT_FEATURE_START_STOP_DAEMON_LONG_OPTIONS(
+//usage:       "-K: stop all matching processes\n"
+//usage:       "-S: start a process unless a matching process is found\n"
 //usage:     "\nProcess matching:"
 //usage:     "\n        -u USERNAME|UID Match only this user's processes"
 //usage:     "\n        -n NAME         Match processes with NAME"
 //usage:     "\n                        in comm field in /proc/PID/stat"
 //usage:     "\n        -x EXECUTABLE   Match processes with this command"
 //usage:     "\n                        command in /proc/PID/cmdline"
-//usage:     "\n        -p FILE         Match a process with PID from the file"
+//usage:     "\n        -p FILE         Match a process with PID from FILE"
 //usage:     "\n        All specified conditions must match"
 //usage:     "\n-S only:"
 //usage:     "\n        -x EXECUTABLE   Program to run"
@@ -132,18 +104,17 @@ Misc options:
 //usage:        IF_FEATURE_START_STOP_DAEMON_FANCY(
 //usage:     "\n        -N N            Change nice level"
 //usage:        )
-//usage:     "\n        -c USER[:[GRP]] Change to user/group"
-//usage:     "\n        -m              Write PID to the pidfile specified by -p"
+//usage:     "\n        -c USER[:[GRP]] Change user/group"
+//usage:     "\n        -m              Write PID to pidfile specified by -p"
 //usage:     "\n-K only:"
 //usage:     "\n        -s SIG          Signal to send"
-//usage:     "\n        -t              Match only, exit with 0 if a process is found"
+//usage:     "\n        -t              Match only, exit with 0 if found"
 //usage:     "\nOther:"
 //usage:        IF_FEATURE_START_STOP_DAEMON_FANCY(
 //usage:     "\n        -o              Exit with status 0 if nothing is done"
 //usage:     "\n        -v              Verbose"
 //usage:        )
 //usage:     "\n        -q              Quiet"
-//usage:        )
 
 #include <sys/resource.h>
 
@@ -409,11 +380,11 @@ static const char start_stop_daemon_longopts[] ALIGN1 =
         "quiet\0"        No_argument       "q"
         "test\0"         No_argument       "t"
         "make-pidfile\0" No_argument       "m"
-#if ENABLE_FEATURE_START_STOP_DAEMON_FANCY
+# if ENABLE_FEATURE_START_STOP_DAEMON_FANCY
         "oknodo\0"       No_argument       "o"
         "verbose\0"      No_argument       "v"
         "nicelevel\0"    Required_argument "N"
-#endif
+# endif
         "startas\0"      Required_argument "a"
         "name\0"         Required_argument "n"
         "signal\0"       Required_argument "s"
@@ -421,10 +392,15 @@ static const char start_stop_daemon_longopts[] ALIGN1 =
         "chuid\0"        Required_argument "c"
         "exec\0"         Required_argument "x"
         "pidfile\0"      Required_argument "p"
-#if ENABLE_FEATURE_START_STOP_DAEMON_FANCY
+# if ENABLE_FEATURE_START_STOP_DAEMON_FANCY
         "retry\0"        Required_argument "R"
-#endif
+# endif
         ;
+# define GETOPT32 getopt32long
+# define LONGOPTS start_stop_daemon_longopts,
+#else
+# define GETOPT32 getopt32
+# define LONGOPTS
 #endif
 
 int start_stop_daemon_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -445,19 +421,18 @@ int start_stop_daemon_main(int argc UNUSED_PARAM, char **argv)
 
         INIT_G();
 
-#if ENABLE_FEATURE_START_STOP_DAEMON_LONG_OPTIONS
-        applet_long_options = start_stop_daemon_longopts;
-#endif
-
-        /* -K or -S is required; they are mutually exclusive */
-        /* -p is required if -m is given */
-        /* -xpun (at least one) is required if -K is given */
-        /* -xa (at least one) is required if -S is given */
-        /* -q turns off -v */
-        opt_complementary = "K:S:K--S:S--K:m?p:K?xpun:S?xa"
-                IF_FEATURE_START_STOP_DAEMON_FANCY("q-v");
-        opt = getopt32(argv, "KSbqtma:n:s:u:c:x:p:"
-                IF_FEATURE_START_STOP_DAEMON_FANCY("ovN:R:"),
+        opt = GETOPT32(argv, "^"
+                "KSbqtma:n:s:u:c:x:p:"
+                IF_FEATURE_START_STOP_DAEMON_FANCY("ovN:R:")
+                        /* -K or -S is required; they are mutually exclusive */
+                        /* -p is required if -m is given */
+                        /* -xpun (at least one) is required if -K is given */
+                        /* -xa (at least one) is required if -S is given */
+                        /* -q turns off -v */
+                        "\0"
+                        "K:S:K--S:S--K:m?p:K?xpun:S?xa"
+                        IF_FEATURE_START_STOP_DAEMON_FANCY("q-v"),
+                LONGOPTS
                 &startas, &cmdname, &signame, &userspec, &chuid, &execname, &pidfile
                 IF_FEATURE_START_STOP_DAEMON_FANCY(,&opt_N)
                 /* We accept and ignore -R <param> / --retry <param> */
@@ -516,6 +491,11 @@ int start_stop_daemon_main(int argc UNUSED_PARAM, char **argv)
                 /* DAEMON_DEVNULL_STDIO is superfluous -
                  * it's always done by bb_daemonize() */
 #else
+                /* Daemons usually call bb_daemonize_or_rexec(), but SSD can do
+                 * without: SSD is not itself a daemon, it _execs_ a daemon.
+                 * The usual NOMMU problem of "child can't run indefinitely,
+                 * it must exec" does not bite us: we exec anyway.
+                 */
                 pid_t pid = xvfork();
                 if (pid != 0) {
                         /* parent */
@@ -525,12 +505,8 @@ int start_stop_daemon_main(int argc UNUSED_PARAM, char **argv)
                 }
                 /* Child */
                 setsid(); /* detach from controlling tty */
-                /* Redirect stdio to /dev/null, close extra FDs.
-                 * We do not actually daemonize because of DAEMON_ONLY_SANITIZE */
-                bb_daemonize_or_rexec(DAEMON_DEVNULL_STDIO
-                        + DAEMON_CLOSE_EXTRA_FDS
-                        + DAEMON_ONLY_SANITIZE,
-                        NULL /* argv, unused */ );
+                /* Redirect stdio to /dev/null, close extra FDs */
+                bb_daemon_helper(DAEMON_DEVNULL_STDIO + DAEMON_CLOSE_EXTRA_FDS);
 #endif
         }
         if (opt & OPT_MAKEPID) {
diff --git a/debianutils/which.c b/debianutils/which.c
index 23a481438..fbfd19cdc 100644
--- a/debianutils/which.c
+++ b/debianutils/which.c
@@ -12,7 +12,7 @@
 //config:       which is used to find programs in your PATH and
 //config:       print out their pathnames.
 
-//applet:IF_WHICH(APPLET(which, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_WHICH(APPLET_NOFORK(which, which, BB_DIR_USR_BIN, BB_SUID_DROP, which))
 
 //kbuild:lib-$(CONFIG_WHICH) += which.o
 
@@ -37,8 +37,7 @@ int which_main(int argc UNUSED_PARAM, char **argv)
         if (!env_path)
                 env_path = bb_default_root_path;
 
-        opt_complementary = "-1"; /* at least one argument */
-        getopt32(argv, "a");
+        getopt32(argv, "^" "a" "\0" "-1"/*at least one arg*/);
         argv += optind;
 
         do {
@@ -73,6 +72,8 @@ int which_main(int argc UNUSED_PARAM, char **argv)
                         char *tmp;
 
                         path = tmp = xstrdup(env_path);
+//NOFORK FIXME: nested xmallocs (one is inside find_executable())
+//can leak memory on failure
                         while ((p = find_executable(*argv, &tmp)) != NULL) {
                                 missing = 0;
                                 puts(p);