Merge commit 'b83c9704128dd106071184e4b00335a3b8486857' into merge

4 files changed, 110 insertions, 2 deletions

diff --git a/debianutils/pipe_progress.c b/debianutils/pipe_progress.c
index 1e57dc241..2c7444f31 100644
--- a/debianutils/pipe_progress.c
+++ b/debianutils/pipe_progress.c
@@ -6,6 +6,10 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+
+//usage:#define pipe_progress_trivial_usage NOUSAGE_STR
+//usage:#define pipe_progress_full_usage ""
+
 #include "libbb.h"
 
 #define PIPE_PROGRESS_SIZE 4096
diff --git a/debianutils/run_parts.c b/debianutils/run_parts.c
index b93a5a917..0c2302696 100644
--- a/debianutils/run_parts.c
+++ b/debianutils/run_parts.c
@@ -30,6 +30,32 @@
  * -u MASK      umask. Set the umask of the program executed to MASK.
  */
 
+//usage:#define run_parts_trivial_usage
+//usage:       "[-t] "IF_FEATURE_RUN_PARTS_FANCY("[-l] ")"[-a ARG] [-u MASK] DIRECTORY"
+//usage:#define run_parts_full_usage "\n\n"
+//usage:       "Run a bunch of scripts in DIRECTORY\n"
+//usage:     "\nOptions:"
+//usage:     "\n        -t      Print what would be run, but don't actually run anything"
+//usage:     "\n        -a ARG  Pass ARG as argument for every program"
+//usage:     "\n        -u MASK Set the umask to MASK before running every program"
+//usage:        IF_FEATURE_RUN_PARTS_FANCY(
+//usage:     "\n        -l      Print names of all matching files even if they are not executable"
+//usage:        )
+//usage:
+//usage:#define run_parts_example_usage
+//usage:       "$ run-parts -a start /etc/init.d\n"
+//usage:       "$ run-parts -a stop=now /etc/init.d\n\n"
+//usage:       "Let's assume you have a script foo/dosomething:\n"
+//usage:       "#!/bin/sh\n"
+//usage:       "for i in $*; do eval $i; done; unset i\n"
+//usage:       "case \"$1\" in\n"
+//usage:       "start*) echo starting something;;\n"
+//usage:       "stop*) set -x; shutdown -h $stop;;\n"
+//usage:       "esac\n\n"
+//usage:       "Running this yields:\n"
+//usage:       "$run-parts -a stop=+4m foo/\n"
+//usage:       "+ shutdown -h +4m"
+
 #include "libbb.h"
 
 struct globals {
diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c
index d2ee95068..bc61959d2 100644
--- a/debianutils/start_stop_daemon.c
+++ b/debianutils/start_stop_daemon.c
@@ -56,6 +56,69 @@ Misc options:
         -v,--verbose            Verbose
 */
 
+//usage:#define start_stop_daemon_trivial_usage
+//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/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:     "\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        All specified conditions must match"
+//usage:     "\n-S only:"
+//usage:     "\n        -x EXECUTABLE   Program to run"
+//usage:     "\n        -a NAME         Zeroth argument"
+//usage:     "\n        -b              Background"
+//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-K only:"
+//usage:     "\n        -s SIG          Signal to send"
+//usage:     "\n        -t              Match only, exit with 0 if a process is 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>
 
 /* Override ENABLE_FEATURE_PIDFILE */
@@ -274,11 +337,17 @@ static int do_stop(void)
                 goto ret;
         }
         for (p = G.found_procs; p; p = p->next) {
-                if (TEST || kill(p->pid, signal_nr) == 0) {
+                if (kill(p->pid, TEST ? 0 : signal_nr) == 0) {
                         killed++;
                 } else {
-                        p->pid = 0;
                         bb_perror_msg("warning: killing process %u", (unsigned)p->pid);
+                        p->pid = 0;
+                        if (TEST) {
+                                /* Example: -K --test --pidfile PIDFILE detected
+                                 * that PIDFILE's pid doesn't exist */
+                                killed = -1;
+                                goto ret;
+                        }
                 }
         }
         if (!QUIET && killed) {
diff --git a/debianutils/which.c b/debianutils/which.c
index 0cf786803..6e92901bc 100644
--- a/debianutils/which.c
+++ b/debianutils/which.c
@@ -10,6 +10,15 @@
  * Based on which from debianutils
  */
 
+//usage:#define which_trivial_usage
+//usage:       "[COMMAND]..."
+//usage:#define which_full_usage "\n\n"
+//usage:       "Locate a COMMAND"
+//usage:
+//usage:#define which_example_usage
+//usage:       "$ which login\n"
+//usage:       "/bin/login\n"
+
 #include "libbb.h"
 
 int which_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;