From: Daniel Shahaf <d.s@daniel.shahaf.name>
To: zsh-workers@zsh.org
Subject: [PATCH] typeset: set $? on incidental error
Date: Thu, 14 Jan 2016 00:13:36 +0000 [thread overview]
Message-ID: <20160114001336.GA11173@tarsus.local2> (raw)
The 'typeset' family of builtins doesn't set $? when one would expect it
to do so:
% x=$(true) y=$(exit 42); echo $?
42
% local x=$(true) y=$(exit 42); echo $?
0
This patch makes 'typeset' behave as ordiary assignment does.
It's a one-liner but still, I'd appreciate a second pair of eyes over it.
Cheers,
Daniel
diff --git a/Src/builtin.c b/Src/builtin.c
index d8974eb..c4af66f 100644
--- a/Src/builtin.c
+++ b/Src/builtin.c
@@ -475,9 +475,13 @@ execbuiltin(LinkList args, LinkList assigns, Builtin bn)
{
/*
* Takes two sets of arguments.
+ *
+ * Return assignfunc's return value, or if it succeeded return any
+ * preexisting error.
*/
HandlerFuncAssign assignfunc = (HandlerFuncAssign)bn->handlerfunc;
- return (*(assignfunc)) (name, argv, assigns, &ops, bn->funcid);
+ int retval = (*(assignfunc)) (name, argv, assigns, &ops, bn->funcid);
+ return retval ? retval : lastval;
}
else
{
diff --git a/Test/B02typeset.ztst b/Test/B02typeset.ztst
index 7d65cc8..a87ecfb 100644
--- a/Test/B02typeset.ztst
+++ b/Test/B02typeset.ztst
@@ -706,3 +706,13 @@
>typeset -a array=( '' two '' four )
>typeset -a array=( one '' three )
>no really nothing here
+
+ s='local x=$(exit 42); echo $?'
+ eval $s
+ (
+ disable -r local
+ eval $s
+ )
+0:typeset reports errors like parameter assignment does
+>42
+>42
next reply other threads:[~2016-01-14 0:13 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-14 0:13 Daniel Shahaf [this message]
2016-01-14 4:58 ` Bart Schaefer
2016-01-14 5:24 ` Eric Cook
2016-01-15 6:26 ` Daniel Shahaf
2016-01-15 14:46 ` Mikael Magnusson
2016-01-15 14:54 ` Eric Cook
2016-01-15 15:49 ` Peter Stephenson
[not found] ` <20160118022557.GE3979@tarsus.local2>
2016-01-18 4:38 ` Mikael Magnusson
2016-01-18 13:33 ` Mikael Magnusson
2016-01-20 7:47 ` Daniel Shahaf
2016-01-20 15:00 ` Eric Cook
2016-01-23 23:53 ` Daniel Shahaf
2016-01-24 3:32 ` Eric Cook
2016-01-26 22:50 ` Daniel Shahaf
2016-01-27 4:15 ` Error status of "repeat" (was Re: [PATCH] typeset: set $? on incidental error) Bart Schaefer
2016-01-27 4:38 ` Bart Schaefer
2016-01-27 9:52 ` Peter Stephenson
2016-01-29 9:18 ` Daniel Shahaf
2016-01-29 9:29 ` Peter Stephenson
2016-01-29 10:25 ` Daniel Shahaf
2016-01-27 4:17 ` [PATCH] typeset: set $? on incidental error Bart Schaefer
2016-01-29 9:18 ` Daniel Shahaf
2016-01-30 7:46 ` typeset docs flow " Daniel Shahaf
2016-01-30 19:47 ` Bart Schaefer
2016-01-31 0:49 ` Jun T.
2016-01-31 17:03 ` Bart Schaefer
2016-02-01 3:23 ` Jun T.
2016-02-01 5:41 ` Bart Schaefer
2016-01-21 14:22 ` Vincent Lefevre
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=20160114001336.GA11173@tarsus.local2 \
--to=d.s@daniel.shahaf.name \
--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).