[git commit] hush: make "exit" in trap use pre-trap exitcode - fix for nested trap

Denys Vlasenko vda.linux at googlemail.com
Fri Feb 21 01:55:53 UTC 2020


commit: https://git.busybox.net/busybox/commit/?id=3ced804e3118d138781c3e4baa6bf1589b9f2dfd
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

function                                             old     new   delta
check_and_run_traps                                  276     278      +2

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 shell/ash_test/ash-misc/exitcode_trap6.right   |  2 ++
 shell/ash_test/ash-misc/exitcode_trap6.tests   | 11 +++++++++++
 shell/hush.c                                   |  4 +++-
 shell/hush_test/hush-misc/exitcode_trap6.right |  2 ++
 shell/hush_test/hush-misc/exitcode_trap6.tests | 11 +++++++++++
 5 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/shell/ash_test/ash-misc/exitcode_trap6.right b/shell/ash_test/ash-misc/exitcode_trap6.right
new file mode 100644
index 000000000..b76c1908e
--- /dev/null
+++ b/shell/ash_test/ash-misc/exitcode_trap6.right
@@ -0,0 +1,2 @@
+INT
+42:42
diff --git a/shell/ash_test/ash-misc/exitcode_trap6.tests b/shell/ash_test/ash-misc/exitcode_trap6.tests
new file mode 100755
index 000000000..15fb99d2d
--- /dev/null
+++ b/shell/ash_test/ash-misc/exitcode_trap6.tests
@@ -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:$?
diff --git a/shell/hush.c b/shell/hush.c
index b881b001a..357a354e2 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -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);
diff --git a/shell/hush_test/hush-misc/exitcode_trap6.right b/shell/hush_test/hush-misc/exitcode_trap6.right
new file mode 100644
index 000000000..b76c1908e
--- /dev/null
+++ b/shell/hush_test/hush-misc/exitcode_trap6.right
@@ -0,0 +1,2 @@
+INT
+42:42
diff --git a/shell/hush_test/hush-misc/exitcode_trap6.tests b/shell/hush_test/hush-misc/exitcode_trap6.tests
new file mode 100755
index 000000000..15fb99d2d
--- /dev/null
+++ b/shell/hush_test/hush-misc/exitcode_trap6.tests
@@ -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:$?


More information about the busybox-cvs mailing list