emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

print_signames_and_exit -> print_signames (because of "ash calls kill_main")

Browse Source
This commit is contained in:
Denis Vlasenko 2007-09-30 16:32:01 +00:00
parent 605b20e277
commit a4f4de9b7e
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libbb.h
View File

@ -787,7 +787,7 @@ int bb_make_directory(char *path, long mode, int flags);
int get_signum(const char *name); int get_signum(const char *name);
const char *get_signame(int number); 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); char *bb_simplify_path(const char *path);

3
libbb/u_signal_names.c
View File

@ -163,7 +163,7 @@ const char *get_signame(int number)
// Print the whole signal list // Print the whole signal list
void print_signames_and_exit(void) void print_signames(void)
{ {
int signo; int signo;
@ -172,5 +172,4 @@ void print_signames_and_exit(void)
if (name[0]) if (name[0])
puts(name); puts(name);
} }
exit(EXIT_SUCCESS);
} }

3
procps/kill.c
View File

@ -58,7 +58,8 @@ int kill_main(int argc, char **argv)
if (arg[1] == 'l' && arg[2] == '\0') { if (arg[1] == 'l' && arg[2] == '\0') {
if (argc == 1) { if (argc == 1) {
/* Print the whole signal list */ /* Print the whole signal list */
print_signames_and_exit(); print_signames();
return 0;
} }
/* -l <sig list> */ /* -l <sig list> */
while ((arg = *++argv)) { while ((arg = *++argv)) {

6
procps/pgrep.c
View File

@ -87,8 +87,10 @@ int pgrep_main(int argc, char **argv)
scan_mask |= PSSCAN_ARGVN; scan_mask |= PSSCAN_ARGVN;
if (pkill) { if (pkill) {
if (OPT_LIST) /* -l: print the whole signal list */ if (OPT_LIST) { /* -l: print the whole signal list */
print_signames_and_exit(); print_signames();
return 0;
}
if (first_arg && first_arg[0] == '-') { if (first_arg && first_arg[0] == '-') {
signo = get_signum(&first_arg[1]); signo = get_signum(&first_arg[1]);
if (signo < 0) /* || signo > MAX_SIGNUM ? */ if (signo < 0) /* || signo > MAX_SIGNUM ? */