emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hush: fix EXIT trap display inside exit trap handler

Browse Source 
function                                             old     new   delta
hush_exit                                             84      78      -6

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
This commit is contained in:
Denys Vlasenko
2010-09-12 15:38:04 +02:00
parent 2d8187c139
commit a110c90de2
3 changed files with 45 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
shell/hush.c
View File

@@ -1357,10 +1357,10 @@ static void hush_exit(int exitcode)
/* 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 @@ static int FAST_FUNC builtin_exit(char **argv)
* 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 */