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

ash: slightly better (more correct) code for "trap hack"

Browse Source 
function                                             old     new   delta
changepath                                           194     195      +1
evalvar                                             1373    1371      -2
forkchild                                            602     590     -12

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2009-09-25 02:12:27 +02:00
parent c297ea97e2
commit e305c28285
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
shell/ash.c
View File

@ -4526,7 +4526,9 @@ clear_traps(void)
for (tp = trap; tp < &trap[NSIG]; tp++) { for (tp = trap; tp < &trap[NSIG]; tp++) {
if (*tp && **tp) { /* trap not NULL or "" (SIG_IGN) */ if (*tp && **tp) { /* trap not NULL or "" (SIG_IGN) */
INT_OFF; INT_OFF;
free(*tp); if (trap_ptr == trap)
free(*tp);
/* else: it "belongs" to trap_ptr vector, don't free */
*tp = NULL; *tp = NULL;
if ((tp - trap) != 0) if ((tp - trap) != 0)
setsignal(tp - trap); setsignal(tp - trap);
@ -4602,10 +4604,8 @@ forkchild(struct job *jp, union node *n, int mode)
/* This is needed to prevent EXIT trap firing and such /* This is needed to prevent EXIT trap firing and such
* (trap_ptr will be freed in trapcmd()) */ * (trap_ptr will be freed in trapcmd()) */
trap_ptr = memcpy(xmalloc(sizeof(trap)), trap, sizeof(trap)); trap_ptr = memcpy(xmalloc(sizeof(trap)), trap, sizeof(trap));
memset(trap, 0, sizeof(trap));
} else {
clear_traps();
} }
clear_traps();
#if JOBS #if JOBS
/* do job control only in root shell */ /* do job control only in root shell */
doing_jobctl = 0; doing_jobctl = 0;