zsh-workers
 help / color / mirror / code / Atom feed
From: Joshua Krusell <js.shirin@gmail.com>
To: zsh-workers@zsh.org
Cc: Joshua Krusell <js.shirin@gmail.com>
Subject: [PATCH] Improve error message from zparseopts -F
Date: Tue,  2 Feb 2021 23:17:28 +0100	[thread overview]
Message-ID: <20210202221728.371739-1-js.shirin@gmail.com> (raw)

When encountering an option not described by the specs, `zparseopts -F`
prints an error message with the first character following the leading
'-'.  This works great for short options, but for long options it leads
to the uninformative message "bad option: -".

---

I see that this was the original intended behaviour in the V12zparseopts
tests, so ignore if I've missed something.

/Joshua

 Src/Modules/zutil.c     | 5 ++++-
 Test/V12zparseopts.ztst | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Src/Modules/zutil.c b/Src/Modules/zutil.c
index 5c96d06c1..c8017d0c0 100644
--- a/Src/Modules/zutil.c
+++ b/Src/Modules/zutil.c
@@ -1873,7 +1873,10 @@ bin_zparseopts(char *nam, char **args, UNUSED(Options ops), UNUSED(int func))
 	    while (*++o) {
 		if (!(d = sopts[STOUC(*o)])) {
 		    if (fail) {
-			zwarnnam(nam, "bad option: %c", *o);
+			if (*o != '-')
+			    zwarnnam(nam, "bad option: %c", *o);
+			else
+			    zwarnnam(nam, "bad option: %s", o);
 			return 1;
 		    }
 		    o = NULL;
diff --git a/Test/V12zparseopts.ztst b/Test/V12zparseopts.ztst
index d7fc33f72..c41c49022 100644
--- a/Test/V12zparseopts.ztst
+++ b/Test/V12zparseopts.ztst
@@ -69,7 +69,7 @@
 >ret: 1, optv: , argv: -a -x -z
 ?(anon):zparseopts:2: bad option: x
 >ret: 1, optv: , argv: -ax -z
-?(anon):zparseopts:2: bad option: -
+?(anon):zparseopts:2: bad option: -x
 >ret: 1, optv: , argv: -a --x -z
 
   for 1 in '-a 1 2 3' '1 2 3'; do
-- 
2.30.0



             reply	other threads:[~2021-02-02 22:18 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-02 22:17 Joshua Krusell [this message]
2021-02-03 11:28 ` Daniel Shahaf
2021-02-03 11:36   ` Peter Stephenson
2021-02-03 15:06   ` Joshua Krusell

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=20210202221728.371739-1-js.shirin@gmail.com \
    --to=js.shirin@gmail.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).