From: Samuel Holland <samuel@sholland.org>
Date: Tue, 30 Jan 2018 02:36:42 +0000 (-0600)
Subject: getopt_long: accept prefix match of long options containing equals signs
X-Git-Tag: v1.1.19~17
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6f03b61b46d238d480f5b7730ba906e172066e59;p=oweals%2Fmusl.git

getopt_long: accept prefix match of long options containing equals signs

Consider the first equals sign found in the option to be the delimiter
between it and its argument, even if it matches an equals sign in the
option name. This avoids consuming the equals sign, which would prevent
finding the argument. Instead, it forces a partial match of the part of
the option name before the equals sign.

Maintainer's note: GNU getopt_long does not explicitly document this
behavior, but it can be seen as a consequence of how partial matches
are specified, and at least GNU (bfd) ld is known to make use of it.
---

diff --git a/src/misc/getopt_long.c b/src/misc/getopt_long.c
index 0d1501d4..008b747c 100644
--- a/src/misc/getopt_long.c
+++ b/src/misc/getopt_long.c
@@ -63,7 +63,8 @@ static int __getopt_long_core(int argc, char *const *argv, const char *optstring
 			const char *name = longopts[i].name;
 			opt = argv[optind]+1;
 			if (*opt == '-') opt++;
-			for (; *name && *name == *opt; name++, opt++);
+			while (*opt && *opt != '=' && *opt == *name)
+				name++, opt++;
 			if (*opt && *opt != '=') continue;
 			arg = opt;
 			match = i;