hush: move the EXIT trap comment. no code changes
authorDenys Vlasenko <dvlasenk@redhat.com>
Sun, 12 Sep 2010 14:13:44 +0000 (16:13 +0200)
committerDenys Vlasenko <dvlasenk@redhat.com>
Sun, 12 Sep 2010 14:13:44 +0000 (16:13 +0200)
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
shell/hush.c

index 3ad87b19b9dca758e5d07a70cd64103affcce8c0..ce7467245a279df865f714caebb4d87b82de5260 100644 (file)
@@ -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