1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-01-01 05:16:05 +01:00

39305: Fix error handling after parse for here document.

Keep the error status the same as before, but also retain
the interrupt status if that was non-zero.
This commit is contained in:
Peter Stephenson 2016-09-13 09:37:49 +01:00
parent 98581594b5
commit 23c1c774b9
2 changed files with 6 additions and 1 deletions

View file

@ -1,3 +1,8 @@
2016-09-13 Peter Stephenson <p.stephenson@samsung.com>
* 39305: Src/exec.c: error handling on substitution for here
document was illogical.
2016-09-12 Oliver Kiddle <opk@zsh.org>
* 39295: Completion/Unix/Type/_remote_files: allow '--' to

View file

@ -4034,7 +4034,7 @@ gethere(char **strp, int typ)
parsestr(&buf);
if (!errflag) {
if (!(errflag & ERRFLAG_ERROR)) {
/* Retain any user interrupt error */
errflag = ef | (errflag & ERRFLAG_INT);
}