summaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorDenys Vlasenko2010-09-12 16:13:44 +0200
committerDenys Vlasenko2010-09-12 16:13:44 +0200
commitde8c3f667abc6346352726eba731d85715df92e7 (patch)
treee28ee92baa745dbe44bf1b04be315b20da234789 /shell
parenta110c90de2f56bf38de30972813f012d44042cb9 (diff)
downloadbusybox-de8c3f667abc6346352726eba731d85715df92e7.zip
busybox-de8c3f667abc6346352726eba731d85715df92e7.tar.gz
hush: move the EXIT trap comment. no code changes
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Diffstat (limited to 'shell')
-rw-r--r--shell/hush.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/shell/hush.c b/shell/hush.c
index 3ad87b1..ce74672 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -1358,9 +1358,10 @@ static void hush_exit(int exitcode)
argv[1] = G.traps[0];
argv[2] = NULL;
G.exiting = 1; /* prevent EXIT trap recursion */
- builtin_eval(argv);
/* Note: G.traps[0] is not cleared!
- * "trap" will still show it */
+ * "trap" will still show it, if executed
+ * in the handler */
+ builtin_eval(argv);
}
#if ENABLE_HUSH_JOB