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 b01f903..3ad87b1 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -1357,10 +1357,10 @@
/* 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 @@
* 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 */