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

51001: fix for ERR_EXIT with pipeline negation ("!"); update tests

This commit is contained in:
Philippe Altherr 2022-12-03 20:42:13 -08:00 committed by Bart Schaefer
parent fda6fd9513
commit d47b8480f0
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Src/exec.c
View File

@ -63,7 +63,10 @@ typedef struct funcsave *Funcsave;
/**/
int noerrexit;
/* used to suppress ERREXIT or ERRRETURN for one occurrence: 0 or 1 */
/*
* used to suppress ERREXIT and ERRRETURN for the command under evaluation.
* 0 or 1
*/
/**/
int this_noerrexit;
@ -1429,10 +1432,7 @@ execlist(Estate state, int dont_change_job, int exiting)
if (!oldnoerrexit)
noerrexit = isend ? 0 : NOERREXIT_EXIT | NOERREXIT_RETURN;
if (WC_SUBLIST_FLAGS(code) & WC_SUBLIST_NOT) {
/* suppress errexit for "! this_command" */
if (isend)
this_noerrexit = 1;
/* suppress errexit for ! <list-of-shell-commands> */
/* suppress errexit for the commands in ! <list-of-commands> */
noerrexit = NOERREXIT_EXIT | NOERREXIT_RETURN;
}
switch (WC_SUBLIST_TYPE(code)) {
@ -1443,6 +1443,9 @@ execlist(Estate state, int dont_change_job, int exiting)
else
execpline(state, code, ltype, (ltype & Z_END) && exiting);
state->pc = next;
/* suppress errexit for the command "! ..." */
if (WC_SUBLIST_FLAGS(code) & WC_SUBLIST_NOT)
this_noerrexit = 1;
goto sublist_done;
break;
case WC_SUBLIST_AND:

15
Test/C03traps.ztst
View File

@ -720,6 +720,21 @@ F:Must be tested with a top-level script rather than source or function
0:ERR_RETURN in "else" branch in nested function
>Good
(setopt err_exit
! true
print OK
)
0:ERR_EXIT not triggered by "! true"
>OK
(setopt err_exit
fn() { true }
! fn
print OK
)
0:ERR_EXIT not triggered by "! fn"
>OK
(setopt err_exit
false && true
print OK