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

hush: make "exit" in trap use pre-trap exitcode - fix for nested trap

Browse Source 
function                                             old     new   delta
check_and_run_traps                                  276     278      +2

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2020-02-21 02:55:53 +01:00
parent cc9ecd9af1
commit 3ced804e31
5 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shell/ash_test/ash-misc/exitcode_trap6.right Normal file
View File

@ -0,0 +1,2 @@
INT
42:42

11
shell/ash_test/ash-misc/exitcode_trap6.tests Executable file
View File

@ -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:$?

4
shell/hush.c
View File

@ -2107,16 +2107,18 @@ static int check_and_run_traps(void)
if (G_traps[sig][0]) { if (G_traps[sig][0]) {
/* We have user-defined handler */ /* We have user-defined handler */
smalluint save_rcode; smalluint save_rcode;
int save_pre;
char *argv[3]; char *argv[3];
/* argv[0] is unused */ /* argv[0] is unused */
argv[1] = xstrdup(G_traps[sig]); argv[1] = xstrdup(G_traps[sig]);
/* why strdup? trap can modify itself: trap 'trap "echo oops" INT' INT */ /* why strdup? trap can modify itself: trap 'trap "echo oops" INT' INT */
argv[2] = NULL; argv[2] = NULL;
save_pre = G.pre_trap_exitcode;
G.pre_trap_exitcode = save_rcode = G.last_exitcode; G.pre_trap_exitcode = save_rcode = G.last_exitcode;
builtin_eval(argv); builtin_eval(argv);
free(argv[1]); free(argv[1]);
G.pre_trap_exitcode = save_pre;
G.last_exitcode = save_rcode; G.last_exitcode = save_rcode;
G.pre_trap_exitcode = -1;
# if ENABLE_HUSH_FUNCTIONS # if ENABLE_HUSH_FUNCTIONS
if (G.return_exitcode >= 0) { if (G.return_exitcode >= 0) {
debug_printf_exec("trap exitcode:%d\n", G.return_exitcode); debug_printf_exec("trap exitcode:%d\n", G.return_exitcode);

2
shell/hush_test/hush-misc/exitcode_trap6.right Normal file
View File

@ -0,0 +1,2 @@
INT
42:42

11
shell/hush_test/hush-misc/exitcode_trap6.tests Executable file
View File

@ -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:$?