projects
/
platform
/
upstream
/
busybox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a110c90
)
hush: move the EXIT trap comment. no code changes
author
Denys Vlasenko
<dvlasenk@redhat.com>
Sun, 12 Sep 2010 14:13:44 +0000
(16:13 +0200)
committer
Denys 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
patch
|
blob
|
history
diff --git
a/shell/hush.c
b/shell/hush.c
index
3ad87b1
..
ce74672
100644
(file)
--- 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