Re: [BUG] getopts OPTIND

[dana <dana@xxxxxxx>]

On 9 Jan 2018, at 10:22, Francisco de Zuviría Allende <franciscodezuviria@xxxxxxxxx> wrote:
>Execution in bash: ... OPTIND is 5, next -a
>execution in zsh:  ... OPTIND is 4, next -r

I think this fixes it? At least, zsh gives the same output as bash and dash when
i do this. Peter's left an ominous warning about changes to this function that
deserves recognition though...

dana


diff --git a/Src/builtin.c b/Src/builtin.c
index 0211f2721..2550b29f2 100644
--- a/Src/builtin.c
+++ b/Src/builtin.c
@@ -5437,6 +5437,9 @@ bin_getopts(UNUSED(char *name), char **argv, UNUSED(Options ops), UNUSED(int fun
     if(opch == ':' || !(p = memchr(optstr, opch, lenoptstr))) {
 	p = "?";
     err:
+	/* Keep OPTIND correct if the user doesn't return after the error */
+	optcind = 0;
+	zoptind++;
 	zsfree(zoptarg);
 	setsparam(var, ztrdup(p));
 	if(quiet) {
diff --git a/Test/B10getopts.ztst b/Test/B10getopts.ztst
index 7eba5a4b1..f6977accb 100644
--- a/Test/B10getopts.ztst
+++ b/Test/B10getopts.ztst
@@ -79,3 +79,20 @@
   test_getopts +x
 1:one illegal option, + variant
 >test_getopts:3: bad option: +x
+
+  t() { local o; repeat $1 { getopts a: o "${@:2}" 2>&1 }; print -r $OPTIND }
+  t 4 -a -w -e -r -a
+  t 5 -a -w -e -a -w -e
+  t 5 -a -w -e -r -ax -a
+0:OPTIND calculation after error (workers/42248)
+*>*: bad option: -e
+*>*: bad option: -r
+*>*: argument expected after -a option
+>6
+*>*: bad option: -e
+*>*: bad option: -e
+>7
+*>*: bad option: -e
+*>*: bad option: -r
+*>*: argument expected after -a option
+>7