diff options
| author | Eric Andersen <andersen@codepoet.org> | 2004-08-19 18:26:26 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2004-08-19 18:26:26 +0000 |
| commit | a4fcccefa6fda72c0b73f4ef9f391dd5f1f74602 (patch) | |
| tree | 798b0521d72a165e28821efde6ab8ad721bf9903 /procps | |
| parent | b131db43261ed8f89537ec7a246b1b274da8539b (diff) | |
| download | busybox-w32-a4fcccefa6fda72c0b73f4ef9f391dd5f1f74602.tar.gz busybox-w32-a4fcccefa6fda72c0b73f4ef9f391dd5f1f74602.tar.bz2 busybox-w32-a4fcccefa6fda72c0b73f4ef9f391dd5f1f74602.zip | |
Patch from Tito adding support for '-q'
Diffstat (limited to 'procps')
| -rw-r--r-- | procps/kill.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/procps/kill.c b/procps/kill.c index a07855e79..25a8d0124 100644 --- a/procps/kill.c +++ b/procps/kill.c | |||
| @@ -37,11 +37,12 @@ | |||
| 37 | 37 | ||
| 38 | extern int kill_main(int argc, char **argv) | 38 | extern int kill_main(int argc, char **argv) |
| 39 | { | 39 | { |
| 40 | int whichApp, signo = SIGTERM, quiet = 0; | 40 | int whichApp, signo = SIGTERM; |
| 41 | const char *name; | 41 | const char *name; |
| 42 | int errors = 0; | 42 | int errors = 0; |
| 43 | 43 | ||
| 44 | #ifdef CONFIG_KILLALL | 44 | #ifdef CONFIG_KILLALL |
| 45 | int quiet=0; | ||
| 45 | /* Figure out what we are trying to do here */ | 46 | /* Figure out what we are trying to do here */ |
| 46 | whichApp = (strcmp(bb_applet_name, "killall") == 0)? KILLALL : KILL; | 47 | whichApp = (strcmp(bb_applet_name, "killall") == 0)? KILLALL : KILL; |
| 47 | #else | 48 | #else |
| @@ -86,6 +87,7 @@ extern int kill_main(int argc, char **argv) | |||
| 86 | return EXIT_SUCCESS; | 87 | return EXIT_SUCCESS; |
| 87 | } | 88 | } |
| 88 | 89 | ||
| 90 | #ifdef CONFIG_KILLALL | ||
| 89 | /* The -q quiet option */ | 91 | /* The -q quiet option */ |
| 90 | if(argv[1][1]=='q' && argv[1][2]=='\0'){ | 92 | if(argv[1][1]=='q' && argv[1][2]=='\0'){ |
| 91 | quiet++; | 93 | quiet++; |
| @@ -95,6 +97,7 @@ extern int kill_main(int argc, char **argv) | |||
| 95 | goto do_it_now; | 97 | goto do_it_now; |
| 96 | } | 98 | } |
| 97 | } | 99 | } |
| 100 | #endif | ||
| 98 | 101 | ||
| 99 | if(!u_signal_names(argv[1]+1, &signo, 0)) | 102 | if(!u_signal_names(argv[1]+1, &signo, 0)) |
| 100 | bb_error_msg_and_die( "bad signal name '%s'", argv[1]+1); | 103 | bb_error_msg_and_die( "bad signal name '%s'", argv[1]+1); |