aboutsummaryrefslogtreecommitdiff
path: root/procps
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2007-09-30 16:32:01 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2007-09-30 16:32:01 +0000
commita4f4de9b7e73d89ef727796e06172419ab8a177c (patch)
treee8b783cf437452b5ec206e6cb07706c91e9b8180 /procps
parent605b20e277c558eb284595aacbcd3c21168894d3 (diff)
downloadbusybox-w32-a4f4de9b7e73d89ef727796e06172419ab8a177c.tar.gz
busybox-w32-a4f4de9b7e73d89ef727796e06172419ab8a177c.tar.bz2
busybox-w32-a4f4de9b7e73d89ef727796e06172419ab8a177c.zip
print_signames_and_exit -> print_signames (because of "ash calls kill_main")
Diffstat (limited to 'procps')
-rw-r--r--procps/kill.c3
-rw-r--r--procps/pgrep.c6
2 files changed, 6 insertions, 3 deletions
diff --git a/procps/kill.c b/procps/kill.c
index 961f8cb14..323ee7bf4 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -58,7 +58,8 @@ int kill_main(int argc, char **argv)
58 if (arg[1] == 'l' && arg[2] == '\0') { 58 if (arg[1] == 'l' && arg[2] == '\0') {
59 if (argc == 1) { 59 if (argc == 1) {
60 /* Print the whole signal list */ 60 /* Print the whole signal list */
61 print_signames_and_exit(); 61 print_signames();
62 return 0;
62 } 63 }
63 /* -l <sig list> */ 64 /* -l <sig list> */
64 while ((arg = *++argv)) { 65 while ((arg = *++argv)) {
diff --git a/procps/pgrep.c b/procps/pgrep.c
index 3bf087f28..2bedabf72 100644
--- a/procps/pgrep.c
+++ b/procps/pgrep.c
@@ -87,8 +87,10 @@ int pgrep_main(int argc, char **argv)
87 scan_mask |= PSSCAN_ARGVN; 87 scan_mask |= PSSCAN_ARGVN;
88 88
89 if (pkill) { 89 if (pkill) {
90 if (OPT_LIST) /* -l: print the whole signal list */ 90 if (OPT_LIST) { /* -l: print the whole signal list */
91 print_signames_and_exit(); 91 print_signames();
92 return 0;
93 }
92 if (first_arg && first_arg[0] == '-') { 94 if (first_arg && first_arg[0] == '-') {
93 signo = get_signum(&first_arg[1]); 95 signo = get_signum(&first_arg[1]);
94 if (signo < 0) /* || signo > MAX_SIGNUM ? */ 96 if (signo < 0) /* || signo > MAX_SIGNUM ? */