b65d6cb00
Denys Vlasenko
2020-10-24
Subject
hush: do not print killing signal name in `cmd_whihc_dies_on_signal`
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
shell/hush.c +7 -1shell/hush_test/hush-psubst/tick6.right +1 -0shell/hush_test/hush-psubst/tick6.tests +1 -0
shell/hush.c+7 -1
| @@ -8698,9 +8698,15 @@ static int process_wait_result(struct pipe *fg_pipe, pid_t childpid, int status) | |
| */ | |
| if (WIFSIGNALED(status)) { | |
| int sig = WTERMSIG(status); | |
| - | if (i == fg_pipe->num_cmds-1) |
| + | if (G.run_list_level == 1 |
| + | /* ^^^^^ Do not print in nested contexts, example: |
| + | * echo `sleep 1; sh -c 'kill -9 $$'` - prints "137", NOT "Killed 137" |
| + | */ |
| + | && i == fg_pipe->num_cmds-1 |
| + | ) { |
| /* TODO: use strsignal() instead for bash compat? but that's bloat... */ | |
| puts(sig == SIGINT || sig == SIGPIPE ? "" : get_signame(sig)); | |
| + | } |
| /* TODO: if (WCOREDUMP(status)) + " (core dumped)"; */ | |
| /* TODO: MIPS has 128 sigs (1..128), what if sig==128 here? | |
| * Maybe we need to use sig | 128? */ | |
shell/hush_test/hush-psubst/tick6.right+1 -0
| @@ -0,0 +1 @@ | |
| + | 137 |
shell/hush_test/hush-psubst/tick6.tests+1 -0
| @@ -0,0 +1 @@ | |
| + | true; echo `sh -c 'kill -9 $$'` $? |