mirror/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-09-28 15:01:21 +02:00
Code

39901: No EXIT trap on LHS of pipeline.

Browse Source 
There is a special case if the LHS is a shell construct.
Add unit tests for both cases.
This commit is contained in:
Peter Stephenson 2016-11-10 10:37:27 +00:00
parent 370b278565
commit 5f1700755f
3 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2016-11-10 Peter Stephenson <p.stephenson@samsung.com>
* 39901: Src/exec.c, Test/C03traps.ztst: Exiting the left hand
side of a pipeline shouldn't trigger EXIT trap.
2016-11-09 Oliver Kiddle <opk@zsh.org>
* 39890: Completion/Debian/Command/_git-buildpackage,

4
Src/exec.c
View File

@ -1888,6 +1888,10 @@ execpline2(Estate state, wordcode pcode,
entersubsh(((how & Z_ASYNC) ? ESUB_ASYNC : 0)
| ESUB_PGRP | ESUB_KEEPTRAP);
close(synch[1]);
if (sigtrapped[SIGEXIT])
{
unsettrap(SIGEXIT);
}
execcmd_exec(state, &eparams, input, pipes[1], how, 1);
_exit(lastval);
}

17
Test/C03traps.ztst
View File

@ -641,6 +641,23 @@ F:Must be tested with a top-level script rather than source or function
>TERM
>EXIT
# Should not get "hello" in the single quotes.
(
trap "echo hello" EXIT;
{ :; } | { read line; print "'$line'"; }
)
0:EXIT trap not called in LHS of pipeline: Shell construct on LHS
>''
>hello
(
trap "echo hello" EXIT;
cat </dev/null | { read line; print "'$line'"; }
)
0:EXIT trap not called in LHS of pipeline: External command on LHS
>''
>hello
%clean
rm -f TRAPEXIT