3ced804e3
Denys Vlasenko
2020-02-21
Subject
hush: make "exit" in trap use pre-trap exitcode - fix for nested trap
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
shell/ash_test/ash-misc/exitcode_trap6.right +2 -0shell/ash_test/ash-misc/exitcode_trap6.tests +11 -0shell/hush.c +3 -1shell/hush_test/hush-misc/exitcode_trap6.right +2 -0shell/hush_test/hush-misc/exitcode_trap6.tests +11 -0
shell/ash_test/ash-misc/exitcode_trap6.right+2 -0
| @@ -0,0 +1,2 @@ | |
| + | INT |
| + | 42:42 |
shell/ash_test/ash-misc/exitcode_trap6.tests+11 -0
| @@ -0,0 +1,11 @@ | |
| + | # "exit" in trap should not use last command's exitcode, |
| + | # but exitcode on entering the trap. |
| + | # Nested trap should not interfere with this. |
| + | $THIS_SH -c ' |
| + | trap "echo INT" int |
| + | trap "kill -int $$;exit" term |
| + | kill $$ & |
| + | (exit 42) |
| + | wait |
| + | ' |
| + | echo 42:$? |
shell/hush.c+3 -1
| @@ -2107,16 +2107,18 @@ static int check_and_run_traps(void) | |
| if (G_traps[sig][0]) { | |
| /* We have user-defined handler */ | |
| smalluint save_rcode; | |
| + | int save_pre; |
| char *argv[3]; | |
| /* argv[0] is unused */ | |
| argv[1] = xstrdup(G_traps[sig]); | |
| /* why strdup? trap can modify itself: trap 'trap "echo oops" INT' INT */ | |
| argv[2] = NULL; | |
| + | save_pre = G.pre_trap_exitcode; |
| G.pre_trap_exitcode = save_rcode = G.last_exitcode; | |
| builtin_eval(argv); | |
| free(argv[1]); | |
| + | G.pre_trap_exitcode = save_pre; |
| G.last_exitcode = save_rcode; | |
| - | G.pre_trap_exitcode = -1; |
| # if ENABLE_HUSH_FUNCTIONS | |
| if (G.return_exitcode >= 0) { | |
| debug_printf_exec("trap exitcode:%d\n", G.return_exitcode); | |
shell/hush_test/hush-misc/exitcode_trap6.right+2 -0
| @@ -0,0 +1,2 @@ | |
| + | INT |
| + | 42:42 |
shell/hush_test/hush-misc/exitcode_trap6.tests+11 -0
| @@ -0,0 +1,11 @@ | |
| + | # "exit" in trap should not use last command's exitcode, |
| + | # but exitcode on entering the trap. |
| + | # Nested trap should not interfere with this. |
| + | $THIS_SH -c ' |
| + | trap "echo INT" int |
| + | trap "kill -int $$;exit" term |
| + | kill $$ & |
| + | (exit 42) |
| + | wait |
| + | ' |
| + | echo 42:$? |