From: Martijn Dekker <martijn@inlv.org>
To: Zsh hackers list <zsh-workers@zsh.org>
Subject: [PATCH] POSIXBUILTINS: quieten 'unset -f nonexistentfunc'
Date: Wed, 11 Oct 2017 20:44:54 +0200 [thread overview]
Message-ID: <51c2b43e-a0d3-2e4d-15e8-b368c922beec@inlv.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 599 bytes --]
Doing 'unset -f' on an unset function outputs an error message and
causes an unsuccessful exit status. All other shells quietly ignore it.
POSIX specifies for 'unset' that "Unsetting a variable or function that
was not previously set shall not be considered an error [...]".
http://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_29_03
If I have figured this out correctly, then the attached patch causes
'unset -f nonexistent_function' to be quiet and return status 0 if
POSIXBUILTINS is active, without changing the behaviour of 'unfunction'
and 'unhash -f'.
- Martijn
[-- Attachment #2: unset-f-quieten.patch --]
[-- Type: text/plain, Size: 1553 bytes --]
diff --git a/Src/builtin.c b/Src/builtin.c
index 84a2bee..0ff9e4f 100644
--- a/Src/builtin.c
+++ b/Src/builtin.c
@@ -125,7 +125,7 @@ static struct builtin builtins[] =
BUILTIN("unalias", 0, bin_unhash, 0, -1, BIN_UNALIAS, "ams", NULL),
BUILTIN("unfunction", 0, bin_unhash, 1, -1, BIN_UNFUNCTION, "m", "f"),
BUILTIN("unhash", 0, bin_unhash, 1, -1, BIN_UNHASH, "adfms", NULL),
- BUILTIN("unset", BINF_PSPECIAL, bin_unset, 1, -1, 0, "fmv", NULL),
+ BUILTIN("unset", BINF_PSPECIAL, bin_unset, 1, -1, BIN_UNSET, "fmv", NULL),
BUILTIN("unsetopt", 0, bin_setopt, 0, -1, BIN_UNSETOPT, NULL, NULL),
BUILTIN("wait", 0, bin_fg, 0, -1, BIN_WAIT, NULL, NULL),
BUILTIN("whence", 0, bin_whence, 0, -1, 0, "acmpvfsSwx:", NULL),
@@ -4158,6 +4158,10 @@ bin_unhash(char *name, char **argv, Options ops, int func)
for (; *argv; argv++) {
if ((hn = ht->removenode(ht, *argv))) {
ht->freenode(hn);
+ } else if (func == BIN_UNSET && isset(POSIXBUILTINS)) {
+ /* POSIX: unset: "Unsetting a variable or function that was *
+ * not previously set shall not be considered an error." */
+ returnval = 0;
} else {
zwarnnam(name, "no such hash table element: %s", *argv);
returnval = 1;
diff --git a/Src/hashtable.h b/Src/hashtable.h
index 3606e97..21398e1 100644
--- a/Src/hashtable.h
+++ b/Src/hashtable.h
@@ -62,6 +62,7 @@
#define BIN_UNHASH 28
#define BIN_UNALIAS 29
#define BIN_UNFUNCTION 30
+#define BIN_UNSET 31
/* These currently depend on being 0 and 1. */
#define BIN_SETOPT 0
next reply other threads:[~2017-10-11 18:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-11 18:44 Martijn Dekker [this message]
2017-11-02 19:04 ` Martijn Dekker
2017-11-02 20:04 ` Peter Stephenson
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=51c2b43e-a0d3-2e4d-15e8-b368c922beec@inlv.org \
--to=martijn@inlv.org \
--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).