mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-10 10:21:23 +02:00
Code Releases Activity

25643: keep DEBUG and ZERR traps in subshells

Browse source
This commit is contained in:
Peter Stephenson 2008-09-11 14:47:18 +00:00
parent 8bb15c1392
commit fb67cd46ea
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2008-09-11 Peter Stephenson <pws@csr.com> 2008-09-11 Peter Stephenson <pws@csr.com>
* 25643: Doc/Zsh/builtins.yo, Src/exec.c: keep DEBUG and ZERR
traps in subshells.
* 25641: add option (NO_)MULTI_FUNC_DEF to turn off "foo1 * 25641: add option (NO_)MULTI_FUNC_DEF to turn off "foo1
foo2...()" function definitions. foo2...()" function definitions.

4
Doc/Zsh/builtins.yo
View file

@ -1330,7 +1330,9 @@ If var(sig) is tt(0) or tt(EXIT)
and the tt(trap) statement is not executed inside the body of a function, and the tt(trap) statement is not executed inside the body of a function,
then the command var(arg) is executed when the shell terminates. then the command var(arg) is executed when the shell terminates.
tt(ZERR), tt(DEBUG), and tt(EXIT) traps are not executed inside other traps. tt(ZERR), tt(DEBUG), and tt(EXIT) traps are not executed inside other
traps. tt(ZERR) and tt(DEBUG) traps are kept within subshells, while
other traps are reset.
Note that traps defined with the tt(trap) builtin are slightly different Note that traps defined with the tt(trap) builtin are slightly different
from those defined as `tt(TRAP)var(NAL) () { ... }', as the latter have from those defined as `tt(TRAP)var(NAL) () { ... }', as the latter have

3
Src/exec.c
View file

@ -869,7 +869,8 @@ entersubsh(int flags)
if (!(flags & ESUB_KEEPTRAP)) if (!(flags & ESUB_KEEPTRAP))
for (sig = 0; sig < VSIGCOUNT; sig++) for (sig = 0; sig < VSIGCOUNT; sig++)
if (!(sigtrapped[sig] & ZSIG_FUNC)) if (!(sigtrapped[sig] & ZSIG_FUNC) &&
sig != SIGDEBUG && sig != SIGZERR)
unsettrap(sig); unsettrap(sig);
monitor = isset(MONITOR); monitor = isset(MONITOR);
if (flags & ESUB_NOMONITOR) if (flags & ESUB_NOMONITOR)