mirror/ zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-06-01 12:56:04 +02:00
Code

51071: fix ERR_RETURN for functions in conditional statements

This commit is contained in:
Philippe Altherr 2022-12-03 21:03:36 -08:00 committed by Bart Schaefer
parent 28ac3e9fe5
commit 259f1e944b
3 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2022-12-03 Bart Schaefer <schaefer@zsh.org>
* Philippe Altherr: 51071: Src/exec.c, Test/C03traps.ztst: fix
ERR_RETURN when a function using && / || is called within another
statement using && / ||
* Philippe Altherr: 51001: Src/exec.c, Src/loop.c,
Test/C03traps.ztst: adjust handling of ERR_EXIT to more closely
align with POSIX and with other shells; add corresponding tests

12
Src/exec.c
View File

@ -1427,14 +1427,12 @@ execlist(Estate state, int dont_change_job, int exiting)
goto sublist_done;
}
while (wc_code(code) == WC_SUBLIST) {
int isend = (WC_SUBLIST_TYPE(code) == WC_SUBLIST_END);
int isandor = WC_SUBLIST_TYPE(code) != WC_SUBLIST_END;
int isnot = WC_SUBLIST_FLAGS(code) & WC_SUBLIST_NOT;
next = state->pc + WC_SUBLIST_SKIP(code);
if (!oldnoerrexit)
noerrexit = isend ? 0 : NOERREXIT_EXIT | NOERREXIT_RETURN;
if (WC_SUBLIST_FLAGS(code) & WC_SUBLIST_NOT) {
/* suppress errexit for the commands in ! <list-of-commands> */
/* suppress errexit for commands before && and || and after ! */
if (isandor || isnot)
noerrexit = NOERREXIT_EXIT | NOERREXIT_RETURN;
}
switch (WC_SUBLIST_TYPE(code)) {
case WC_SUBLIST_END:
/* End of sublist; just execute, ignoring status. */
@ -1444,7 +1442,7 @@ execlist(Estate state, int dont_change_job, int exiting)
execpline(state, code, ltype, (ltype & Z_END) && exiting);
state->pc = next;
/* suppress errexit for the command "! ..." */
if (WC_SUBLIST_FLAGS(code) & WC_SUBLIST_NOT)
if (isnot)
this_noerrexit = 1;
goto sublist_done;
break;

16
Test/C03traps.ztst
View File

@ -670,6 +670,22 @@ F:Must be tested with a top-level script rather than source or function
>before-out
>before-in
(set -o err_return
fn() {
print before-in
{ false; true } && true
print after-in
}
print before-out
fn && true
print after-out
)
0:ERR_RETURN not triggered on LHS of "&&" in function on LHS of "&&" (regression test)
>before-out
>before-in
>after-in
>after-out
mkdir -p zdotdir
print >zdotdir/.zshenv '
setopt norcs errreturn