diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2015-10-03 22:11:09 -0700 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2015-10-03 22:11:09 -0700 |
| commit | cb26e11c70f95c72e300e1f4f16b33e4e5f54d21 (patch) | |
| tree | 96a618762650ca2675459d40a67150ac7a31d006 /Src | |
| parent | 36766: fix incorrect reset of noerrexit during "if" conditions (diff) | |
| download | zsh-cb26e11c70f95c72e300e1f4f16b33e4e5f54d21.tar zsh-cb26e11c70f95c72e300e1f4f16b33e4e5f54d21.tar.gz zsh-cb26e11c70f95c72e300e1f4f16b33e4e5f54d21.tar.bz2 zsh-cb26e11c70f95c72e300e1f4f16b33e4e5f54d21.tar.lz zsh-cb26e11c70f95c72e300e1f4f16b33e4e5f54d21.tar.xz zsh-cb26e11c70f95c72e300e1f4f16b33e4e5f54d21.tar.zst zsh-cb26e11c70f95c72e300e1f4f16b33e4e5f54d21.zip | |
unposted: back out 36707, add test case for 36766
Diffstat (limited to 'Src')
| -rw-r--r-- | Src/exec.c | 2 | ||||
| -rw-r--r-- | Src/loop.c | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/Src/exec.c b/Src/exec.c index 235faf3ba..bcc8065a2 100644 --- a/Src/exec.c +++ b/Src/exec.c @@ -1409,7 +1409,7 @@ sublist_done: exit(lastval); } if (errreturn) { - retflag = 2; + retflag = 1; breaks = loops; } } diff --git a/Src/loop.c b/Src/loop.c index 7d1528efe..4def9b652 100644 --- a/Src/loop.c +++ b/Src/loop.c @@ -552,12 +552,8 @@ execif(Estate state, int do_exec) run = 1; break; } - if (retflag) { - if (retflag == 2) - retflag = 0; /* Never ERR_RETURN here */ - else - break; - } + if (retflag) + break; s = 1; state->pc = next; } |