diff options
| author | Denis Vlasenko | 2007-09-30 16:32:01 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2007-09-30 16:32:01 +0000 |
| commit | a4f4de9b7e73d89ef727796e06172419ab8a177c (patch) | |
| tree | e8b783cf437452b5ec206e6cb07706c91e9b8180 /procps | |
| parent | 605b20e277c558eb284595aacbcd3c21168894d3 (diff) | |
| download | busybox-a4f4de9b7e73d89ef727796e06172419ab8a177c.zip busybox-a4f4de9b7e73d89ef727796e06172419ab8a177c.tar.gz | |
print_signames_and_exit -> print_signames (because of "ash calls kill_main")
Diffstat (limited to 'procps')
| -rw-r--r-- | procps/kill.c | 3 | ||||
| -rw-r--r-- | procps/pgrep.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/procps/kill.c b/procps/kill.c index 961f8cb..323ee7b 100644 --- a/procps/kill.c +++ b/procps/kill.c @@ -58,7 +58,8 @@ int kill_main(int argc, char **argv) if (arg[1] == 'l' && arg[2] == '\0') { if (argc == 1) { /* Print the whole signal list */ - print_signames_and_exit(); + print_signames(); + return 0; } /* -l <sig list> */ while ((arg = *++argv)) { diff --git a/procps/pgrep.c b/procps/pgrep.c index 3bf087f..2bedabf 100644 --- a/procps/pgrep.c +++ b/procps/pgrep.c @@ -87,8 +87,10 @@ int pgrep_main(int argc, char **argv) scan_mask |= PSSCAN_ARGVN; if (pkill) { - if (OPT_LIST) /* -l: print the whole signal list */ - print_signames_and_exit(); + if (OPT_LIST) { /* -l: print the whole signal list */ + print_signames(); + return 0; + } if (first_arg && first_arg[0] == '-') { signo = get_signum(&first_arg[1]); if (signo < 0) /* || signo > MAX_SIGNUM ? */ |