Implement suggestion from Adam Slattery, (don't default to killing closing bug #1190.

[oweals/busybox.git] / kill.c

diff --git a/kill.c b/kill.c
index 00a4d5c402c612b1c1cf9f555caa80b19b9433c0..fb3d7221315f1fa0b4e27a76e7dc806764bfc2be 100644 (file)
--- a/kill.c
+++ b/kill.c
@@ -21,7 +21,6 @@
  */
 
 
-#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -30,6 +29,7 @@
 #include <ctype.h>
 #include <string.h>
 #include <unistd.h>
+#include "busybox.h"
 
 static const int KILL = 0;
 static const int KILLALL = 1;
@@ -39,7 +39,7 @@ struct signal_name {
        int number;
 };
 
-const struct signal_name signames[] = {
+static const struct signal_name signames[] = {
        /* POSIX signals */
        { "HUP",        SIGHUP },       /* 1 */
        { "INT",        SIGINT },       /* 2 */
@@ -124,22 +124,19 @@ const struct signal_name signames[] = {
 extern int kill_main(int argc, char **argv)
 {
        int whichApp, sig = SIGTERM;
-       const char *appUsage;
 
 #ifdef BB_KILLALL
        /* Figure out what we are trying to do here */
        whichApp = (strcmp(applet_name, "killall") == 0)? KILLALL : KILL; 
-       appUsage = (whichApp == KILLALL)?  killall_usage : kill_usage;
 #else
        whichApp = KILL;
-       appUsage = kill_usage;
 #endif
 
        argc--;
        argv++;
        /* Parse any options */
        if (argc < 1)
-               usage(appUsage);
+               show_usage();
 
        while (argc > 0 && **argv == '-') {
                while (*++(*argv)) {
@@ -163,7 +160,7 @@ extern int kill_main(int argc, char **argv)
                                }
                                break;
                        case '-':
-                               usage(appUsage);
+                               show_usage();
                        default:
                                {
                                        if (isdigit(**argv)) {