*: remove "Options:" string from help texts

[oweals/busybox.git] / procps / kill.c

diff --git a/procps/kill.c b/procps/kill.c
index e418046e7098ad101e4afcbd24e3cf80fa84a974..224e5ad1a41c21d68220318183c467974f921615 100644 (file)
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -5,9 +5,45 @@
  * Copyright (C) 1995, 1996 by Bruce Perens <bruce@pixar.com>.
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
+//usage:#define kill_trivial_usage
+//usage:       "[-l] [-SIG] PID..."
+//usage:#define kill_full_usage "\n\n"
+//usage:       "Send a signal (default: TERM) to given PIDs\n"
+//usage:     "\n       -l      List all signal names and numbers"
+/* //usage:  "\n       -s SIG  Yet another way of specifying SIG" */
+//usage:
+//usage:#define kill_example_usage
+//usage:       "$ ps | grep apache\n"
+//usage:       "252 root     root     S [apache]\n"
+//usage:       "263 www-data www-data S [apache]\n"
+//usage:       "264 www-data www-data S [apache]\n"
+//usage:       "265 www-data www-data S [apache]\n"
+//usage:       "266 www-data www-data S [apache]\n"
+//usage:       "267 www-data www-data S [apache]\n"
+//usage:       "$ kill 252\n"
+//usage:
+//usage:#define killall_trivial_usage
+//usage:       "[-l] [-q] [-SIG] PROCESS_NAME..."
+//usage:#define killall_full_usage "\n\n"
+//usage:       "Send a signal (default: TERM) to given processes\n"
+//usage:     "\n       -l      List all signal names and numbers"
+/* //usage:  "\n       -s SIG  Yet another way of specifying SIG" */
+//usage:     "\n       -q      Don't complain if no processes were killed"
+//usage:
+//usage:#define killall_example_usage
+//usage:       "$ killall apache\n"
+//usage:
+//usage:#define killall5_trivial_usage
+//usage:       "[-l] [-SIG] [-o PID]..."
+//usage:#define killall5_full_usage "\n\n"
+//usage:       "Send a signal (default: TERM) to all processes outside current session\n"
+//usage:     "\n       -l      List all signal names and numbers"
+//usage:     "\n       -o PID  Don't signal this PID"
+/* //usage:  "\n       -s SIG  Yet another way of specifying SIG" */
+
 #include "libbb.h"
 
 /* Note: kill_main is directly called from shell in order to implement
@@ -153,7 +189,7 @@ int kill_main(int argc, char **argv)
                                        arg = argv[i];
                                omit = bb_strtoi(arg, NULL, 10);
                                if (errno) {
-                                       bb_error_msg("bad pid '%s'", arg);
+                                       bb_error_msg("invalid number '%s'", arg);
                                        ret = 1;
                                        goto resume;
                                }
@@ -195,7 +231,7 @@ int kill_main(int argc, char **argv)
                                                continue;
                                        errors++;
                                        if (!quiet)
-                                               bb_perror_msg("can't kill pid %u", (unsigned)*pl);
+                                               bb_perror_msg("can't kill pid %d", (int)*pl);
                                }
                        }
                        free(pidList);
@@ -206,17 +242,37 @@ int kill_main(int argc, char **argv)
 
        /* Looks like they want to do a kill. Do that */
        while (arg) {
-               /* Support shell 'space' trick */
-               if (arg[0] == ' ')
-                       arg++;
+#if ENABLE_ASH || ENABLE_HUSH
+               /*
+                * We need to support shell's "hack formats" of
+                * " -PRGP_ID" (yes, with a leading space)
+                * and " PID1 PID2 PID3" (with degenerate case "")
+                */
+               while (*arg != '\0') {
+                       char *end;
+                       if (*arg == ' ')
+                               arg++;
+                       pid = bb_strtoi(arg, &end, 10);
+                       if (errno && (errno != EINVAL || *end != ' ')) {
+                               bb_error_msg("invalid number '%s'", arg);
+                               *end = '\0';
+                               errors++;
+                       } else if (kill(pid, signo) != 0) {
+                               bb_perror_msg("can't kill pid %d", (int)pid);
+                               errors++;
+                       }
+                       arg = end; /* can only point to ' ' or '\0' now */
+               }
+#else
                pid = bb_strtoi(arg, NULL, 10);
                if (errno) {
-                       bb_error_msg("bad pid '%s'", arg);
+                       bb_error_msg("invalid number '%s'", arg);
                        errors++;
                } else if (kill(pid, signo) != 0) {
                        bb_perror_msg("can't kill pid %d", (int)pid);
                        errors++;
                }
+#endif
                arg = *++argv;
        }
        return errors;