emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix indentation. Support killall -q, for pcmcia-cs

Browse Source 
-Erik
This commit is contained in:
Eric Andersen 2002-07-23 23:45:11 +00:00
parent f2f26e7fdd
commit 80cd3cfdbc
1 changed files with 52 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
procps/kill.c
View File

@ -38,7 +38,7 @@ static const int KILLALL = 1;
extern int kill_main(int argc, char **argv) extern int kill_main(int argc, char **argv)
{ {
int whichApp, sig = SIGTERM; int whichApp, sig = SIGTERM, quiet;
const char *name; const char *name;
#ifdef CONFIG_KILLALL #ifdef CONFIG_KILLALL
@ -48,6 +48,7 @@ extern int kill_main(int argc, char **argv)
whichApp = KILL; whichApp = KILL;
#endif #endif
quiet=0;
argc--; argc--;
argv++; argv++;
/* Parse any options */ /* Parse any options */
@ -57,6 +58,11 @@ extern int kill_main(int argc, char **argv)
while (argc > 0 && **argv == '-') { while (argc > 0 && **argv == '-') {
while (*++(*argv)) { while (*++(*argv)) {
switch (**argv) { switch (**argv) {
#ifdef CONFIG_KILLALL
case 'q':
quiet++;
break;
#endif
case 'l': case 'l':
if(argc>1) { if(argc>1) {
for(argv++; *argv; argv++) { for(argv++; *argv; argv++) {
@ -104,8 +110,9 @@ extern int kill_main(int argc, char **argv)
if (!isdigit(**argv)) if (!isdigit(**argv))
perror_msg_and_die( "Bad PID"); perror_msg_and_die( "Bad PID");
pid = strtol(*argv, NULL, 0); pid = strtol(*argv, NULL, 0);
if (kill(pid, sig) != 0) if (kill(pid, sig) != 0) {
perror_msg_and_die( "Could not kill pid '%d'", pid); perror_msg_and_die( "Could not kill pid '%d'", pid);
}
argv++; argv++;
} }
} }
@ -120,15 +127,24 @@ extern int kill_main(int argc, char **argv)
pidList = find_pid_by_name( *argv); pidList = find_pid_by_name( *argv);
if (!pidList || *pidList<=0) { if (!pidList || *pidList<=0) {
all_found = FALSE; all_found = FALSE;
if (quiet) {
exit(EXIT_FAILURE);
} else {
error_msg_and_die( "%s: no process killed", *argv); error_msg_and_die( "%s: no process killed", *argv);
} }
}
for(; pidList && *pidList!=0; pidList++) { for(; pidList && *pidList!=0; pidList++) {
if (*pidList==myPid) if (*pidList==myPid)
continue; continue;
if (kill(*pidList, sig) != 0) if (kill(*pidList, sig) != 0) {
if (quiet) {
exit(EXIT_FAILURE);
} else {
perror_msg_and_die( "Could not kill pid '%d'", *pidList); perror_msg_and_die( "Could not kill pid '%d'", *pidList);
} }
}
}
/* Note that we don't bother to free the memory /* Note that we don't bother to free the memory
* allocated in find_pid_by_name(). It will be freed * allocated in find_pid_by_name(). It will be freed
* upon exit, so we can save a byte or two */ * upon exit, so we can save a byte or two */