From: Herbert Xu <herbert@gondor.apana.org.au>
To: dash@vger.kernel.org
Subject: [PATCH] eval: Always set exitstatus in evaltree
Date: Tue, 6 Dec 2022 16:49:14 +0800 [thread overview]
Message-ID: <Y48CCiIAagbl5q0L@gondor.apana.org.au> (raw)
There is no harm in setting exitstatus unconditionally in evaltree.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
diff --git a/src/eval.c b/src/eval.c
index 3337f71..eda251e 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -239,7 +239,7 @@ evaltree(union node *n, int flags)
#endif
case NNOT:
status = !evaltree(n->nnot.com, EV_TESTED);
- goto setstatus;
+ break;
case NREDIR:
errlinno = lineno = n->nredir.linno;
if (funcline)
@@ -250,7 +250,7 @@ evaltree(union node *n, int flags)
evaltree(n->nredir.n, flags & EV_TESTED);
if (n->nredir.redirect)
popredir(0);
- goto setstatus;
+ break;
case NCMD:
evalfn = evalcommand;
checkexit:
@@ -292,7 +292,7 @@ evaln:
evalfn = evaltree;
calleval:
status = evalfn(n, flags);
- goto setstatus;
+ break;
case NIF:
status = evaltree(n->nif.test, EV_TESTED);
if (evalskip)
@@ -305,13 +305,14 @@ calleval:
goto evaln;
}
status = 0;
- goto setstatus;
+ break;
case NDEFUN:
defun(n);
-setstatus:
- exitstatus = status;
break;
}
+
+ exitstatus = status;
+
out:
dotrap();
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
next reply other threads:[~2022-12-06 8:49 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-06 8:49 Herbert Xu [this message]
2022-12-06 10:15 ` [PATCH] eval: Always set exitstatus in evaltree Harald van Dijk
2022-12-06 10:40 ` Herbert Xu
2022-12-07 8:55 ` [PATCH] eval: Test evalskip before flipping status for NNOT Herbert Xu
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=Y48CCiIAagbl5q0L@gondor.apana.org.au \
--to=herbert@gondor.apana.org.au \
--cc=dash@vger.kernel.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.
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 read-only IMAP folder(s) and NNTP newsgroup(s).