diff options
| author | Samuel Holland <samuel@sholland.org> | 2018-01-29 20:36:41 -0600 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2018-01-31 22:02:49 -0500 |
| commit | f1abc29bd09dde14edd942f5868446aaba77f73f (patch) | |
| tree | 22c1834e4b3749add6a7dfac0901d12428613b67 | |
| parent | 14edadb542848300193b76d2eee7a1eae07f0911 (diff) | |
| download | musl-f1abc29bd09dde14edd942f5868446aaba77f73f.tar.gz | |
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".
| -rw-r--r-- | src/misc/getopt_long.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/misc/getopt_long.c b/src/misc/getopt_long.c index 568ae7ba..0d1501d4 100644 --- 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) { |