hush: fix EXIT trap display inside exit trap handler

function                                             old     new   delta
hush_exit                                             84      78      -6

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>

diff --git a/shell/hush.c b/shell/hush.c
index b01f90370da304837d7a2afde88328081ef31639..3ad87b19b9dca758e5d07a70cd64103affcce8c0 100644 (file)
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -1357,10 +1357,10 @@ static void hush_exit(int exitcode)
                /* argv[0] is unused */
                argv[1] = G.traps[0];
                argv[2] = NULL;
-               G.traps[0] = NULL;
-               G.exiting = 1;
+               G.exiting = 1; /* prevent EXIT trap recursion */
                builtin_eval(argv);
-               /* free(argv[1]); - why bother */
+               /* Note: G.traps[0] is not cleared!
+                * "trap" will still show it */
        }
 
 #if ENABLE_HUSH_JOB
@@ -7864,7 +7864,7 @@ static int FAST_FUNC builtin_exit(char **argv)
         * exit
         # EEE (then bash exits)
         *
-        * we can use G.exiting = -1 as indicator "last cmd was exit"
+        * TODO: we can use G.exiting = -1 as indicator "last cmd was exit"
         */
 
        /* note: EXIT trap is run by hush_exit */

diff --git a/shell/hush_test/hush-trap/exit.right b/shell/hush_test/hush-trap/exit.right
index b4932fb7f1a12bee40ca9eea71bb93a0ffed9643..3d0072564bc880a87e3a9460a1cf8ac858224429 100644 (file)
--- a/shell/hush_test/hush-trap/exit.right
+++ b/shell/hush_test/hush-trap/exit.right
@@ -1,2 +1,12 @@
 cow
 moo
+Traps1:
+trap -- 'exitfunc' EXIT
+Traps2:
+trap -- 'echo Should not run' EXIT
+Check1: 42
+Traps1:
+trap -- 'exitfunc' EXIT
+Traps2:
+trap -- 'echo Should not run' EXIT
+Check2: 42

diff --git a/shell/hush_test/hush-trap/exit.tests b/shell/hush_test/hush-trap/exit.tests
index 092543c251873319659fac0cfc1f781cb5fa6ab1..2061105dd7b15c55ff2c92afd803e0aa6f33d107 100755 (executable)
--- a/shell/hush_test/hush-trap/exit.tests
+++ b/shell/hush_test/hush-trap/exit.tests
@@ -1,3 +1,34 @@
 "$THIS_SH" -c 'trap "echo cow" 0'
 "$THIS_SH" -c 'trap "echo moo" EXIT'
 "$THIS_SH" -c 'trap "echo no" 0; trap 0'
+
+(
+exitfunc() {
+        echo "Traps1:"
+        trap
+        # EXIT trap is disabled after it is triggered,
+        # it can not be "re-armed" like this:
+        trap "echo Should not run" EXIT
+        echo "Traps2:"
+        trap
+}
+trap 'exitfunc' EXIT
+exit 42
+)
+echo Check1: $?
+
+(
+exitfunc() {
+        echo "Traps1:"
+        trap
+        # EXIT trap is disabled after it is triggered,
+        # it can not be "re-armed" like this:
+        trap "echo Should not run" EXIT
+        echo "Traps2:"
+        trap
+        exit 42
+}
+trap 'exitfunc' EXIT
+exit 66
+)
+echo Check2: $?