a4f4de9b7
Denis Vlasenko
2007-09-30
Subject
print_signames_and_exit -> print_signames (because of "ash calls kill_main")
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
include/libbb.h+1 -1
| @@ -787,7 +787,7 @@ int bb_make_directory(char *path, long mode, int flags); | |
| int get_signum(const char *name); | |
| const char *get_signame(int number); | |
| - | void print_signames_and_exit(void) ATTRIBUTE_NORETURN; |
| + | void print_signames(void); |
| char *bb_simplify_path(const char *path); | |
libbb/u_signal_names.c+1 -2
| @@ -163,7 +163,7 @@ const char *get_signame(int number) | |
| // Print the whole signal list | |
| - | void print_signames_and_exit(void) |
| + | void print_signames(void) |
| { | |
| int signo; | |
| @@ -172,5 +172,4 @@ void print_signames_and_exit(void) | |
| if (name[0]) | |
| puts(name); | |
| } | |
| - | exit(EXIT_SUCCESS); |
| } | |
procps/kill.c+2 -1
| @@ -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)) { | |
procps/pgrep.c+4 -2
| @@ -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 ? */ | |