From: Denys Vlasenko <dvlasenk@redhat.com>
Date: Sun, 12 Sep 2010 14:13:44 +0000 (+0200)
Subject: hush: move the EXIT trap comment. no code changes
X-Git-Tag: 1_18_0~217
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=de8c3f667abc6346352726eba731d85715df92e7;p=oweals%2Fbusybox.git

hush: move the EXIT trap comment. no code changes

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

diff --git a/shell/hush.c b/shell/hush.c
index 3ad87b19b..ce7467245 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