*/
-#include "internal.h"
+#include "busybox.h"
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <unistd.h>
#include <signal.h>
#include <ctype.h>
-#include <sys/stat.h>
+#include <string.h>
#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";
-
-#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";
-#endif
-
-#define KILL 0
-#define KILLALL 1
+static const int KILL = 0;
+static const int KILLALL = 1;
struct signal_name {
const char *name;
};
const struct signal_name signames[] = {
- {"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},
+ /* POSIX signals */
+ { "HUP", SIGHUP }, /* 1 */
+ { "INT", SIGINT }, /* 2 */
+ { "QUIT", SIGQUIT }, /* 3 */
+ { "ILL", SIGILL }, /* 4 */
+ { "ABRT", SIGABRT }, /* 6 */
+ { "FPE", SIGFPE }, /* 8 */
+ { "KILL", SIGKILL }, /* 9 */
+ { "SEGV", SIGSEGV }, /* 11 */
+ { "PIPE", SIGPIPE }, /* 13 */
+ { "ALRM", SIGALRM }, /* 14 */
+ { "TERM", SIGTERM }, /* 15 */
+ { "USR1", SIGUSR1 }, /* 10 (arm,i386,m68k,ppc), 30 (alpha,sparc*), 16 (mips) */
+ { "USR2", SIGUSR2 }, /* 12 (arm,i386,m68k,ppc), 31 (alpha,sparc*), 17 (mips) */
+ { "CHLD", SIGCHLD }, /* 17 (arm,i386,m68k,ppc), 20 (alpha,sparc*), 18 (mips) */
+ { "CONT", SIGCONT }, /* 18 (arm,i386,m68k,ppc), 19 (alpha,sparc*), 25 (mips) */
+ { "STOP", SIGSTOP }, /* 19 (arm,i386,m68k,ppc), 17 (alpha,sparc*), 23 (mips) */
+ { "TSTP", SIGTSTP }, /* 20 (arm,i386,m68k,ppc), 18 (alpha,sparc*), 24 (mips) */
+ { "TTIN", SIGTTIN }, /* 21 (arm,i386,m68k,ppc,alpha,sparc*), 26 (mips) */
+ { "TTOU", SIGTTOU }, /* 22 (arm,i386,m68k,ppc,alpha,sparc*), 27 (mips) */
+ /* Miscellaneous other signals */
+#ifdef SIGTRAP
+ { "TRAP", SIGTRAP }, /* 5 */
#endif
- {"FPE", SIGFPE},
- {"KILL", SIGKILL},
-#if defined(__sparc__) || defined(__alpha__)
- {"BUS", SIGBUS},
-#else
- {"USR1", SIGUSR1},
+#ifdef SIGIOT
+ { "IOT", SIGIOT }, /* 6, same as SIGABRT */
#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},
- {"STOP", SIGSTOP},
- {"TSTP", SIGTSTP},
- {"CONT", SIGCONT},
- {"CHLD", SIGCHLD},
- {"TTIN", SIGTTIN},
- {"TTOU", SIGTTOU},
- {"IO", SIGIO},
-# ifndef __alpha__
- {"POLL", SIGIO},
-# endif
- {"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},
- {"POLL", SIGPOLL},
- {"PWR", SIGPWR},
- {"UNUSED", SIGUNUSED},
+#ifdef SIGEMT
+ { "EMT", SIGEMT }, /* 7 (mips,alpha,sparc*) */
+#endif
+#ifdef SIGBUS
+ { "BUS", SIGBUS }, /* 7 (arm,i386,m68k,ppc), 10 (mips,alpha,sparc*) */
+#endif
+#ifdef SIGSYS
+ { "SYS", SIGSYS }, /* 12 (mips,alpha,sparc*) */
+#endif
+#ifdef SIGSTKFLT
+ { "STKFLT", SIGSTKFLT }, /* 16 (arm,i386,m68k,ppc) */
+#endif
+#ifdef SIGURG
+ { "URG", SIGURG }, /* 23 (arm,i386,m68k,ppc), 16 (alpha,sparc*), 21 (mips) */
+#endif
+#ifdef SIGIO
+ { "IO", SIGIO }, /* 29 (arm,i386,m68k,ppc), 23 (alpha,sparc*), 22 (mips) */
+#endif
+#ifdef SIGPOLL
+ { "POLL", SIGPOLL }, /* same as SIGIO */
+#endif
+#ifdef SIGCLD
+ { "CLD", SIGCLD }, /* same as SIGCHLD (mips) */
+#endif
+#ifdef SIGXCPU
+ { "XCPU", SIGXCPU }, /* 24 (arm,i386,m68k,ppc,alpha,sparc*), 30 (mips) */
+#endif
+#ifdef SIGXFSZ
+ { "XFSZ", SIGXFSZ }, /* 25 (arm,i386,m68k,ppc,alpha,sparc*), 31 (mips) */
+#endif
+#ifdef SIGVTALRM
+ { "VTALRM", SIGVTALRM }, /* 26 (arm,i386,m68k,ppc,alpha,sparc*), 28 (mips) */
+#endif
+#ifdef SIGPROF
+ { "PROF", SIGPROF }, /* 27 (arm,i386,m68k,ppc,alpha,sparc*), 29 (mips) */
+#endif
+#ifdef SIGPWR
+ { "PWR", SIGPWR }, /* 30 (arm,i386,m68k,ppc), 29 (alpha,sparc*), 19 (mips) */
+#endif
+#ifdef SIGINFO
+ { "INFO", SIGINFO }, /* 29 (alpha) */
+#endif
+#ifdef SIGLOST
+ { "LOST", SIGLOST }, /* 29 (arm,i386,m68k,ppc,sparc*) */
+#endif
+#ifdef SIGWINCH
+ { "WINCH", SIGWINCH }, /* 28 (arm,i386,m68k,ppc,alpha,sparc*), 20 (mips) */
+#endif
+#ifdef SIGUNUSED
+ { "UNUSED", SIGUNUSED }, /* 31 (arm,i386,m68k,ppc) */
#endif
{0, 0}
};
#ifdef BB_KILLALL
/* Figure out what we are trying to do here */
- whichApp = (strcmp(*argv, "killall") == 0)?
- KILLALL : KILL;
+ whichApp = (strcmp(applet_name, "killall") == 0)? KILLALL : KILL;
appUsage = (whichApp == KILLALL)? killall_usage : kill_usage;
#else
whichApp = KILL;
}
}
fprintf(stderr, "\n\n");
- exit(TRUE);
+ return EXIT_SUCCESS;
}
break;
case '-':
int pid;
if (!isdigit(**argv))
- fatalError( "Bad PID: %s\n", strerror(errno));
+ perror_msg_and_die( "Bad PID");
pid = strtol(*argv, NULL, 0);
if (kill(pid, sig) != 0)
- fatalError( "Could not kill pid '%d': %s\n", pid, strerror(errno));
+ perror_msg_and_die( "Could not kill pid '%d'", pid);
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) {
pid_t* pidList;
- pidList = findPidByName( *argv);
- for(; pidList && pidList!=0; pidList++) {
+ pidList = find_pid_by_name( *argv);
+ if (!pidList) {
+ all_found = FALSE;
+ error_msg( "%s: no process killed\n", *argv);
+ }
+
+ 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));
- else
- printf("killed %d\n", *pidList);
+ perror_msg_and_die( "Could not kill pid '%d'", *pidList);
}
/* Note that we don't bother to free the memory
- * allocated in findPidByName(). It will be freed
+ * allocated in find_pid_by_name(). It will be freed
* upon exit, so we can save a byte or two */
argv++;
}
+ if (all_found == FALSE)
+ return EXIT_FAILURE;
}
#endif
- exit(TRUE);
+ return EXIT_SUCCESS;
end:
- fatalError( "bad signal name: %s\n", *argv);
+ error_msg_and_die( "bad signal name: %s\n", *argv);
}