mirror of
https://github.com/sheumann/hush.git
synced 2024-09-12 00:55:11 +00:00
print_signames_and_exit -> print_signames (because of "ash calls kill_main")
This commit is contained in:
parent
605b20e277
commit
a4f4de9b7e
@ -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);
|
||||||
|
|
||||||
|
@ -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);
|
|
||||||
}
|
}
|
||||||
|
@ -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)) {
|
||||||
|
@ -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 ? */
|
||||||
|
Loading…
Reference in New Issue
Block a user