Quick mod to enable option -a for ifconfig.

[oweals/busybox.git] / kill.c

diff --git a/kill.c b/kill.c
index caaa52a5b041645f9183fc3d2d02a9c910e227f1..fb3d7221315f1fa0b4e27a76e7dc806764bfc2be 100644 (file)
--- a/kill.c
+++ b/kill.c
@@ -21,24 +21,25 @@
  */
 
 
-#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <unistd.h>
 #include <signal.h>
 #include <ctype.h>
+#include <string.h>
 #include <unistd.h>
+#include "busybox.h"
 
-#define KILL   0
-#define KILLALL        1
+static const int KILL = 0;
+static const int KILLALL = 1;
 
 struct signal_name {
        const char *name;
        int number;
 };
 
-const struct signal_name signames[] = {
+static const struct signal_name signames[] = {
        /* POSIX signals */
        { "HUP",        SIGHUP },       /* 1 */
        { "INT",        SIGINT },       /* 2 */
@@ -123,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)) {
@@ -162,7 +160,7 @@ extern int kill_main(int argc, char **argv)
                                }
                                break;
                        case '-':
-                               usage(appUsage);
+                               show_usage();
                        default:
                                {
                                        if (isdigit(**argv)) {
@@ -204,10 +202,10 @@ extern int kill_main(int argc, char **argv)
                        int pid;
 
                        if (!isdigit(**argv))
-                               error_msg_and_die( "Bad PID: %s\n", strerror(errno));
+                               perror_msg_and_die( "Bad PID");
                        pid = strtol(*argv, NULL, 0);
                        if (kill(pid, sig) != 0) 
-                               error_msg_and_die( "Could not kill pid '%d': %s\n", pid, strerror(errno));
+                               perror_msg_and_die( "Could not kill pid '%d'", pid);
                        argv++;
                }
        } 
@@ -222,14 +220,14 @@ extern int kill_main(int argc, char **argv)
                        pidList = find_pid_by_name( *argv);
                        if (!pidList) {
                                all_found = FALSE;
-                               error_msg( "%s: no process killed\n", *argv);
+                               error_msg( "%s: no process killed", *argv);
                        }
 
                        for(; pidList && *pidList!=0; pidList++) {
                                if (*pidList==myPid)
                                        continue;
                                if (kill(*pidList, sig) != 0) 
-                                       error_msg_and_die( "Could not kill pid '%d': %s\n", *pidList, strerror(errno));
+                                       perror_msg_and_die( "Could not kill pid '%d'", *pidList);
                        }
                        /* Note that we don't bother to free the memory
                         * allocated in find_pid_by_name().  It will be freed
@@ -245,5 +243,5 @@ extern int kill_main(int argc, char **argv)
 
 
   end:
-       error_msg_and_die( "bad signal name: %s\n", *argv);
+       error_msg_and_die( "bad signal name: %s", *argv);
 }