#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
}
#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