diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2004-07-26 13:18:07 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2004-07-26 13:18:07 +0000 |
| commit | 17e576782c4fd64194d4908af5b9774308f1205f (patch) | |
| tree | 17dd493a05fe17e0e2f90d9dbf30551dd7d97e35 /Src | |
| parent | 725616d600e4e574aa1cdd3ac0abe874a512fe14 (diff) | |
| download | zsh-17e576782c4fd64194d4908af5b9774308f1205f.tar.gz zsh-17e576782c4fd64194d4908af5b9774308f1205f.zip | |
20198: fix TRAPEXIT.
Diffstat (limited to 'Src')
| -rw-r--r-- | Src/exec.c | 6 | ||||
| -rw-r--r-- | Src/signals.c | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/Src/exec.c b/Src/exec.c index 83f397335..ee0752035 100644 --- a/Src/exec.c +++ b/Src/exec.c @@ -3495,7 +3495,8 @@ doshfunc(char *name, Eprog prog, LinkList doshargs, int flags, int noreturnval) memcpy(oldpipestats, pipestats, bytes); } - starttrapscope(); + if (!intrap) + starttrapscope(); tab = pparams; if (!(flags & PM_UNDEFINED)) @@ -3595,7 +3596,8 @@ doshfunc(char *name, Eprog prog, LinkList doshargs, int flags, int noreturnval) opts[LOCALOPTIONS] = saveopts[LOCALOPTIONS]; } - endtrapscope(); + if (!intrap) + endtrapscope(); if (trapreturn < -1) trapreturn++; diff --git a/Src/signals.c b/Src/signals.c index 1c134aaa6..064feb480 100644 --- a/Src/signals.c +++ b/Src/signals.c @@ -939,6 +939,10 @@ endtrapscope(void) * with non-standard sigtrapped & sigfuncs values */ +/* Are we already executing a trap? */ +/**/ +int intrap; + /**/ void dotrapargs(int sig, int *sigtr, void *sigfn) @@ -949,9 +953,6 @@ dotrapargs(int sig, int *sigtr, void *sigfn) int obreaks = breaks; int isfunc; - /* Are we already executing a trap? */ - static int intrap; - /* if signal is being ignored or the trap function * * is NULL, then return * * * |