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

ash: fix return_in_trap1.tests failure

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2016-10-01 23:25:12 +02:00
parent 3ed7e2749a
commit b98b4c103f
1 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
shell/ash.c
View File

@ -8420,43 +8420,46 @@ static int evalstring(char *s, int flags);
* Perhaps we should avoid entering new trap handlers * Perhaps we should avoid entering new trap handlers
* while we are executing a trap handler. [is it a TODO?] * while we are executing a trap handler. [is it a TODO?]
*/ */
static int static void
dotrap(void) dotrap(void)
{ {
uint8_t *g; uint8_t *g;
int sig; int sig;
uint8_t savestatus; uint8_t last_status;
savestatus = exitstatus; if (!pending_sig)
return;
last_status = exitstatus;
pending_sig = 0; pending_sig = 0;
xbarrier(); xbarrier();
TRACE(("dotrap entered\n")); TRACE(("dotrap entered\n"));
for (sig = 1, g = gotsig; sig < NSIG; sig++, g++) { for (sig = 1, g = gotsig; sig < NSIG; sig++, g++) {
char *t; char *p;
if (*g == 0) if (!*g)
continue; continue;
t = trap[sig];
if (evalskip) {
pending_sig = sig;
break;
}
p = trap[sig];
/* non-trapped SIGINT is handled separately by raise_interrupt, /* non-trapped SIGINT is handled separately by raise_interrupt,
* don't upset it by resetting gotsig[SIGINT-1] */ * don't upset it by resetting gotsig[SIGINT-1] */
if (sig == SIGINT && !t) if (sig == SIGINT && !p)
continue; continue;
TRACE(("sig %d is active, will run handler '%s'\n", sig, t)); TRACE(("sig %d is active, will run handler '%s'\n", sig, p));
*g = 0; *g = 0;
if (!t) if (!p)
continue; continue;
evalstring(t, 0); evalstring(p, 0);
exitstatus = savestatus;
if (evalskip) {
TRACE(("dotrap returns %d\n", evalskip));
return evalskip;
} }
} exitstatus = last_status;
TRACE(("dotrap returns\n"));
TRACE(("dotrap returns 0\n"));
return 0;
} }
/* forward declarations - evaluation is fairly recursive business... */ /* forward declarations - evaluation is fairly recursive business... */
@ -8492,6 +8495,8 @@ evaltree(union node *n, int flags)
} }
TRACE(("evaltree(%p: %d, %d) called\n", n, n->type, flags)); TRACE(("evaltree(%p: %d, %d) called\n", n, n->type, flags));
dotrap();
exception_handler = &jmploc; exception_handler = &jmploc;
{ {
int err = setjmp(jmploc.loc); int err = setjmp(jmploc.loc);
@ -8609,12 +8614,12 @@ evaltree(union node *n, int flags)
/* Order of checks below is important: /* Order of checks below is important:
* signal handlers trigger before exit caused by "set -e". * signal handlers trigger before exit caused by "set -e".
*/ */
if ((pending_sig && dotrap()) dotrap();
|| (checkexit & status)
|| (flags & EV_EXIT) if (checkexit & status)
) { raise_exception(EXEXIT);
if (flags & EV_EXIT)
raise_exception(EXEXIT); raise_exception(EXEXIT);
}
RESTORE_INT(int_level); RESTORE_INT(int_level);
TRACE(("leaving evaltree (no interrupts)\n")); TRACE(("leaving evaltree (no interrupts)\n"));