*/
-#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"
static const int KILL = 0;
static const int KILLALL = 1;
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)) {
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++) {
end:
- error_msg_and_die( "bad signal name: %s\n", *argv);
+ error_msg_and_die( "bad signal name: %s", *argv);
}