From: Bart Schaefer <schaefer@brasslantern.com>
To: zsh-workers@zsh.org
Subject: Re: errexit and (Z)ERR trap regression
Date: Mon, 24 Jun 2024 16:02:40 -0700 [thread overview]
Message-ID: <CAH+w=7YrF3RMjqY6RJKjH=o8pTziok08aAx4g8gfff9_KYdVuQ@mail.gmail.com> (raw)
In-Reply-To: <33ca21c3-69f8-49f7-9350-2ff9cc4febca@app.fastmail.com>
[-- Attachment #1: Type: text/plain, Size: 484 bytes --]
On Fri, Jun 21, 2024 at 10:50 PM Lawrence Velázquez <larryv@zsh.org> wrote:
>
> > set -e; true && { false; echo one; } || echo two
> >
> > Is "false" there considered to be "any command of an AND-OR list" ?
>
> This ought to work the same as the subshell version: early exit is
> suppressed for the commands "true" and "{ false; echo one; }", so
> the overall output is still "one".
The following seems to fix all six of the mentioned cases from this
thread, then.
[-- Attachment #2: noerrexit-sublist-last.txt --]
[-- Type: text/plain, Size: 1244 bytes --]
diff --git a/Src/exec.c b/Src/exec.c
index e955e85df..3f0afa3d5 100644
--- a/Src/exec.c
+++ b/Src/exec.c
@@ -1486,6 +1486,8 @@ execlist(Estate state, int dont_change_job, int exiting)
/* suppress errexit for commands before && and || and after ! */
if (isandor || isnot)
noerrexit |= NOERREXIT_EXIT | NOERREXIT_RETURN;
+ else if (!oldnoerrexit)
+ noerrexit = 0;
switch (WC_SUBLIST_TYPE(code)) {
case WC_SUBLIST_END:
/* End of sublist; just execute, ignoring status. */
diff --git a/Test/C03traps.ztst b/Test/C03traps.ztst
index de57765a0..47a15bf7f 100644
--- a/Test/C03traps.ztst
+++ b/Test/C03traps.ztst
@@ -995,6 +995,18 @@ F:Must be tested with a top-level script rather than source or function
?loop 0
?loop 1
+ ( true && (set -e; false; echo NOT REACHED) )
+ ( true && (trap "print Trapped!" ERR; false) )
+ ( true && { set -e; false; echo NOT REACHED } )
+ ( true && { trap "print Trapped!" ERR; false } )
+ ( set -e; true && (false; echo one) || echo two )
+ ( set -e; true && { false; echo one; } || echo two )
+0:ERR_EXIT is triggered by last command in an AND-OR list
+>Trapped!
+>Trapped!
+>one
+>one
+
if zmodload zsh/system 2>/dev/null; then
(
trap 'echo TERM; exit 2' TERM
next prev parent reply other threads:[~2024-06-24 23:03 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-20 17:12 Martijn Dekker
2024-06-21 18:46 ` Bart Schaefer
2024-06-21 20:02 ` Lawrence Velázquez
2024-06-21 20:36 ` Bart Schaefer
2024-06-22 5:49 ` Lawrence Velázquez
2024-06-24 23:02 ` Bart Schaefer [this message]
2024-06-26 12:42 ` Philippe Altherr
2024-06-26 21:43 ` Bart Schaefer
2024-06-27 2:01 ` Philippe Altherr
2024-06-27 16:43 ` Bart Schaefer
2024-06-27 17:09 ` Philippe Altherr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAH+w=7YrF3RMjqY6RJKjH=o8pTziok08aAx4g8gfff9_KYdVuQ@mail.gmail.com' \
--to=schaefer@brasslantern.com \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).