fix getopt_long arguments to partial matches

If we find a partial option name match, we need to keep looking for
ambiguous/conflicting options. However, we need to remember the position
in the candidate argument to find its option-argument later, if there is
one. This fixes e.g. option "foobar" being given as "--fooba=baz".

diff --git a/src/misc/getopt_long.c b/src/misc/getopt_long.c
index 568ae7ba9dac991eda343bcd2ab2e30371309dff..0d1501d457c11c9072b3beb124a3b11ab2954863 100644 (file)
--- a/src/misc/getopt_long.c
+++ b/src/misc/getopt_long.c
@@ -58,13 +58,14 @@ static int __getopt_long_core(int argc, char *const *argv, const char *optstring
        {
                int colon = optstring[optstring[0]=='+'||optstring[0]=='-']==':';
                int i, cnt, match;
-               char *opt;
+               char *arg, *opt;
                for (cnt=i=0; longopts[i].name; i++) {
                        const char *name = longopts[i].name;
                        opt = argv[optind]+1;
                        if (*opt == '-') opt++;
                        for (; *name && *name == *opt; name++, opt++);
                        if (*opt && *opt != '=') continue;
+                       arg = opt;
                        match = i;
                        if (!*name) {
                                cnt = 1;
@@ -74,6 +75,7 @@ static int __getopt_long_core(int argc, char *const *argv, const char *optstring
                }
                if (cnt==1) {
                        i = match;
+                       opt = arg;
                        optind++;
                        if (*opt == '=') {
                                if (!longopts[i].has_arg) {