diff options
Diffstat (limited to 'procps/kill.c')
-rw-r--r-- | procps/kill.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/procps/kill.c b/procps/kill.c index 1b31a7291..9b96b4c1a 100644 --- a/procps/kill.c +++ b/procps/kill.c | |||
@@ -15,26 +15,26 @@ int kill_main(int argc, char **argv) | |||
15 | char *arg; | 15 | char *arg; |
16 | pid_t pid; | 16 | pid_t pid; |
17 | int signo = SIGTERM, errors = 0, quiet = 0; | 17 | int signo = SIGTERM, errors = 0, quiet = 0; |
18 | const int killall = (ENABLE_KILLALL && applet_name[4]=='a' | 18 | const int killall = (ENABLE_KILLALL && applet_name[4] == 'a' |
19 | && (!ENABLE_KILLALL5 || applet_name[7]!='5')); | 19 | && (!ENABLE_KILLALL5 || applet_name[7] != '5')); |
20 | const int killall5 = (ENABLE_KILLALL5 && applet_name[4]=='a' | 20 | const int killall5 = (ENABLE_KILLALL5 && applet_name[4] == 'a' |
21 | && (!ENABLE_KILLALL || applet_name[7]=='5')); | 21 | && (!ENABLE_KILLALL || applet_name[7] == '5')); |
22 | 22 | ||
23 | /* Parse any options */ | 23 | /* Parse any options */ |
24 | argc--; | 24 | argc--; |
25 | arg = *++argv; | 25 | arg = *++argv; |
26 | 26 | ||
27 | if (argc<1 || arg[0]!='-') { | 27 | if (argc < 1 || arg[0] != '-') { |
28 | goto do_it_now; | 28 | goto do_it_now; |
29 | } | 29 | } |
30 | 30 | ||
31 | /* The -l option, which prints out signal names. */ | 31 | /* The -l option, which prints out signal names. */ |
32 | if (arg[1]=='l' && arg[2]=='\0') { | 32 | if (arg[1] == 'l' && arg[2] == '\0') { |
33 | const char *name; | 33 | const char *name; |
34 | if (argc==1) { | 34 | if (argc == 1) { |
35 | /* Print the whole signal list */ | 35 | /* Print the whole signal list */ |
36 | int col = 0; | 36 | int col = 0; |
37 | for (signo = 1; signo<32; signo++) { | 37 | for (signo = 1; signo < 32; signo++) { |
38 | name = get_signame(signo); | 38 | name = get_signame(signo); |
39 | if (isdigit(name[0])) continue; | 39 | if (isdigit(name[0])) continue; |
40 | if (col > 66) { | 40 | if (col > 66) { |
@@ -45,13 +45,13 @@ int kill_main(int argc, char **argv) | |||
45 | } | 45 | } |
46 | puts(""); | 46 | puts(""); |
47 | } else { /* -l <sig list> */ | 47 | } else { /* -l <sig list> */ |
48 | while ((arg = *++argv)!=NULL) { | 48 | while ((arg = *++argv)) { |
49 | if (isdigit(arg[0])) { | 49 | if (isdigit(arg[0])) { |
50 | signo = xatoi_u(arg); | 50 | signo = xatoi_u(arg); |
51 | name = get_signame(signo); | 51 | name = get_signame(signo); |
52 | } else { | 52 | } else { |
53 | signo = get_signum(arg); | 53 | signo = get_signum(arg); |
54 | if (signo<0) | 54 | if (signo < 0) |
55 | bb_error_msg_and_die("unknown signal '%s'", arg); | 55 | bb_error_msg_and_die("unknown signal '%s'", arg); |
56 | name = get_signame(signo); | 56 | name = get_signame(signo); |
57 | } | 57 | } |
@@ -63,17 +63,17 @@ int kill_main(int argc, char **argv) | |||
63 | } | 63 | } |
64 | 64 | ||
65 | /* The -q quiet option */ | 65 | /* The -q quiet option */ |
66 | if (killall && arg[1]=='q' && arg[2]=='\0') { | 66 | if (killall && arg[1] == 'q' && arg[2] == '\0') { |
67 | quiet = 1; | 67 | quiet = 1; |
68 | arg = *++argv; | 68 | arg = *++argv; |
69 | argc--; | 69 | argc--; |
70 | if (argc<1) bb_show_usage(); | 70 | if (argc < 1) bb_show_usage(); |
71 | if (arg[0]!='-') goto do_it_now; | 71 | if (arg[0] != '-') goto do_it_now; |
72 | } | 72 | } |
73 | 73 | ||
74 | /* -SIG */ | 74 | /* -SIG */ |
75 | signo = get_signum(&arg[1]); | 75 | signo = get_signum(&arg[1]); |
76 | if (signo<0) | 76 | if (signo < 0) |
77 | bb_error_msg_and_die("bad signal name '%s'", &arg[1]); | 77 | bb_error_msg_and_die("bad signal name '%s'", &arg[1]); |
78 | arg = *++argv; | 78 | arg = *++argv; |
79 | argc--; | 79 | argc--; |