*/
-#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;
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)) {
}
break;
case '-':
- usage(appUsage);
+ show_usage();
default:
{
if (isdigit(**argv)) {
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++;
}
}
while (--argc >= 0) {
pid_t* pidList;
- pidList = findPidByName( *argv);
+ pidList = find_pid_by_name( *argv);
if (!pidList) {
all_found = FALSE;
- errorMsg( "%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)
- fatalError( "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 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++;
}
end:
- fatalError( "bad signal name: %s\n", *argv);
+ error_msg_and_die( "bad signal name: %s", *argv);
}