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
Download Patch File Download Diff File Expand all files Collapse all files

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