mirror/ zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-05-14 03:26:16 +02:00
Code

50897: nonzero status of complex commands should trigger ERR_EXIT

This commit is contained in:
Bart Schaefer 2022-11-08 20:36:49 -08:00
parent 298919f43a
commit d873ed6026
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2022-11-08 Bart Schaefer <schaefer@zsh.org>
* 50897: Src/exec.c, Src/loop.c: nonzero status of complex
commands should trigger ERR_EXIT
2022-11-08 Peter Stephenson <p.stephenson@samsung.com>
* users/28338: Src/lex.c, Test/D08cmdsubst.ztst: edge case of an

2
Src/exec.c
View File

@ -451,7 +451,7 @@ execcursh(Estate state, int do_exec)
cmdpop();
state->pc = end;
this_noerrexit = 1;
this_noerrexit = (WC_SUBLIST_TYPE(*end) != WC_SUBLIST_END);
return lastval;
}

12
Src/loop.c
View File

@ -208,7 +208,7 @@ execfor(Estate state, int do_exec)
loops--;
simple_pline = old_simple_pline;
state->pc = end;
this_noerrexit = 1;
this_noerrexit = (WC_SUBLIST_TYPE(*end) != WC_SUBLIST_END);
return lastval;
}
@ -336,7 +336,7 @@ execselect(Estate state, UNUSED(int do_exec))
loops--;
simple_pline = old_simple_pline;
state->pc = end;
this_noerrexit = 1;
this_noerrexit = (WC_SUBLIST_TYPE(*end) != WC_SUBLIST_END);
return lastval;
}
@ -478,7 +478,7 @@ execwhile(Estate state, UNUSED(int do_exec))
popheap();
loops--;
state->pc = end;
this_noerrexit = 1;
this_noerrexit = (WC_SUBLIST_TYPE(*end) != WC_SUBLIST_END);
return lastval;
}
@ -532,7 +532,7 @@ execrepeat(Estate state, UNUSED(int do_exec))
loops--;
simple_pline = old_simple_pline;
state->pc = end;
this_noerrexit = 1;
this_noerrexit = (WC_SUBLIST_TYPE(*end) != WC_SUBLIST_END);
return lastval;
}
@ -587,7 +587,7 @@ execif(Estate state, int do_exec)
lastval = 0;
}
state->pc = end;
this_noerrexit = 1;
this_noerrexit = (WC_SUBLIST_TYPE(*end) != WC_SUBLIST_END);
return lastval;
}
@ -701,7 +701,7 @@ execcase(Estate state, int do_exec)
if (!anypatok)
lastval = 0;
this_noerrexit = 1;
this_noerrexit = (WC_SUBLIST_TYPE(*end) != WC_SUBLIST_END);
return lastval;
}