Added changelog entries for grep/sed/regex changes.

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

diff --git a/procps/kill.c b/procps/kill.c
index 10343a150ad6bd170bf78e4f63c680544f9d0bb9..a0b93be2b9caea100665541dbb45aa2a6145f5b7 100644 (file)
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Mini kill implementation for busybox
+ * Mini kill/killall implementation for busybox
  *
  * Copyright (C) 1995, 1996 by Bruce Perens <bruce@pixar.com>.
  *
@@ -32,16 +32,22 @@
 #include <unistd.h>
 
 static const char *kill_usage =
-       "kill [-signal] process-id [process-id ...]\n\n"
-       "Send a signal (default is SIGTERM) to the specified process(es).\n\n"
-       "Options:\n" "\t-l\tList all signal names and numbers.\n\n";
+       "kill [-signal] process-id [process-id ...]\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nSend a signal (default is SIGTERM) to the specified process(es).\n\n"
+       "Options:\n" "\t-l\tList all signal names and numbers.\n\n"
+#endif
+       ;
 
 #ifdef BB_KILLALL
 static const char *killall_usage =
-       "killall [-signal] process-name [process-name ...]\n\n"
-       "Send a signal (default is SIGTERM) to the specified process(es).\n\n"
-       "Options:\n" "\t-l\tList all signal names and numbers.\n\n";
+       "killall [-signal] process-name [process-name ...]\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nSend a signal (default is SIGTERM) to the specified process(es).\n\n"
+       "Options:\n" "\t-l\tList all signal names and numbers.\n\n"
+#endif
 #endif
+       ;
 
 #define KILL   0
 #define KILLALL        1
@@ -52,76 +58,60 @@ struct signal_name {
 };
 
 const struct signal_name signames[] = {
+       /* Everything, order not important */
        {"HUP", SIGHUP},
        {"INT", SIGINT},
        {"QUIT", SIGQUIT},
        {"ILL", SIGILL},
        {"TRAP", SIGTRAP},
        {"ABRT", SIGABRT},
-#ifndef __alpha__
-       {"IOT", SIGIOT},
-#endif
-#if defined(__sparc__) || defined(__alpha__)
-       {"EMT", SIGEMT},
-#else
-       {"BUS", SIGBUS},
-#endif
        {"FPE", SIGFPE},
        {"KILL", SIGKILL},
-#if defined(__sparc__) || defined(__alpha__)
-       {"BUS", SIGBUS},
-#else
-       {"USR1", SIGUSR1},
-#endif
        {"SEGV", SIGSEGV},
-#if defined(__sparc__) || defined(__alpha__)
-       {"SYS", SIGSYS},
-#else
-       {"USR2", SIGUSR2},
-#endif
        {"PIPE", SIGPIPE},
        {"ALRM", SIGALRM},
        {"TERM", SIGTERM},
-#if defined(__sparc__) || defined(__alpha__)
-       {"URG", SIGURG},
+       {"BUS", SIGBUS},
+       {"USR1", SIGUSR1},
+       {"USR2", SIGUSR2},
        {"STOP", SIGSTOP},
-       {"TSTP", SIGTSTP},
        {"CONT", SIGCONT},
-       {"CHLD", SIGCHLD},
        {"TTIN", SIGTTIN},
        {"TTOU", SIGTTOU},
        {"IO", SIGIO},
-# ifndef __alpha__
-       {"POLL", SIGIO},
-# endif
+       {"TSTP", SIGTSTP},
+       {"CHLD", SIGCHLD},
        {"XCPU", SIGXCPU},
        {"XFSZ", SIGXFSZ},
-       {"VTALRM", SIGVTALRM},
        {"PROF", SIGPROF},
        {"WINCH", SIGWINCH},
-# ifdef __alpha__
-       {"INFO", SIGINFO},
-# else
-       {"LOST", SIGLOST},
-# endif
-       {"USR1", SIGUSR1},
-       {"USR2", SIGUSR2},
-#else
-       {"STKFLT", SIGSTKFLT},
-       {"CHLD", SIGCHLD},
-       {"CONT", SIGCONT},
-       {"STOP", SIGSTOP},
-       {"TSTP", SIGTSTP},
-       {"TTIN", SIGTTIN},
-       {"TTOU", SIGTTOU},
        {"URG", SIGURG},
-       {"XCPU", SIGXCPU},
-       {"XFSZ", SIGXFSZ},
        {"VTALRM", SIGVTALRM},
-       {"PROF", SIGPROF},
-       {"WINCH", SIGWINCH},
-       {"IO", SIGIO},
+#ifndef __alpha__
+       /* everything except alpha */
+       {"IOT", SIGIOT},
        {"POLL", SIGPOLL},
+#endif
+#if defined(__sparc__) || defined(__alpha__) || defined(__mips__)
+       /* everthing except intel */
+       {"EMT", SIGEMT},
+       {"SYS", SIGSYS},
+# ifdef __alpha__
+               /* alpha only */
+               {"LOST", SIGLOST},
+#endif
+#ifdef __sparc__
+               /* space only */
+               {"INFO", SIGINFO},
+#endif
+#ifdef __mips__
+               /* mips only */
+               {"CLD", SIGCLD},
+               {"PWR", SIGPWR},
+#endif
+#else
+       /* intel only */
+       {"STKFLT", SIGSTKFLT},
        {"PWR", SIGPWR},
        {"UNUSED", SIGUNUSED},
 #endif
@@ -222,16 +212,30 @@ extern int kill_main(int argc, char **argv)
        } 
 #ifdef BB_KILLALL
        else {
+               int all_found = TRUE;
+               pid_t myPid=getpid();
                /* Looks like they want to do a killall.  Do that */
                while (--argc >= 0) {
-                       int pid;
+                       pid_t* pidList;
+
+                       pidList = findPidByName( *argv);
+                       if (!pidList) {
+                               all_found = FALSE;
+                               errorMsg( "%s: no process killed\n", *argv);
+                       }
 
-                       while((pid = findPidByName( *argv))) {
-                               if (kill(pid, sig) != 0) 
-                                       fatalError( "Could not kill pid '%d': %s\n", pid, strerror(errno));
+                       for(; pidList && *pidList!=0; pidList++) {
+                               if (*pidList==myPid)
+                                       continue;
+                               if (kill(*pidList, sig) != 0) 
+                                       fatalError( "Could not kill pid '%d': %s\n", *pidList, strerror(errno));
                        }
+                       /* Note that we don't bother to free the memory
+                        * allocated in findPidByName().  It will be freed
+                        * upon exit, so we can save a byte or two */
                        argv++;
                }
+               exit (all_found);
        }
 #endif