From: Szabolcs Nagy <nsz@port70.net>
To: musl@lists.openwall.com
Subject: Re: getopt_long_only bug
Date: Thu, 26 Apr 2018 22:17:13 +0200 [thread overview]
Message-ID: <20180426201713.GS4418@port70.net> (raw)
In-Reply-To: <20180426145037.GG3094@brightrain.aerifal.cx>
* Rich Felker <dalias@libc.org> [2018-04-26 10:50:37 -0400]:
> OK, this is a weird corner case. Apparently when in longonly mode,
> short options need to be counted in addition to long ones for
> determining if a partial match is unique.
>
> The attached patch should solve the problem. Any review/comments would
> be helpful. It uses an ugly inline strstr of sorts, because to use
> strstr we'd need to copy to a temp buffer, and we wouldn't even
> benefit since the string being searched is so short (usually 1 byte,
> at most 4). The only reason it's there at all is because we committed
> to supporting multibyte option chars in getopt.c so getopt_long_only
> needs to handle them consistently.
looks ok to me.
> diff --git a/src/misc/getopt_long.c b/src/misc/getopt_long.c
> index 008b747..ddcef94 100644
> --- a/src/misc/getopt_long.c
> +++ b/src/misc/getopt_long.c
> @@ -1,5 +1,7 @@
> #define _GNU_SOURCE
> #include <stddef.h>
> +#include <stdlib.h>
> +#include <limits.h>
> #include <getopt.h>
> #include <stdio.h>
> #include <string.h>
> @@ -58,10 +60,10 @@ 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 *arg, *opt;
> + char *arg, *opt, *start = argv[optind]+1;
> for (cnt=i=0; longopts[i].name; i++) {
> const char *name = longopts[i].name;
> - opt = argv[optind]+1;
> + opt = start;
> if (*opt == '-') opt++;
> while (*opt && *opt != '=' && *opt == *name)
> name++, opt++;
> @@ -74,6 +76,17 @@ static int __getopt_long_core(int argc, char *const *argv, const char *optstring
> }
> cnt++;
> }
> + if (cnt==1 && longonly && arg-start == mblen(start, MB_LEN_MAX)) {
> + int l = arg-start;
> + for (i=0; optstring[i]; i++) {
> + int j;
> + for (j=0; j<l && start[j]==optstring[i+j]; j++);
> + if (j==l) {
> + cnt++;
> + break;
> + }
> + }
> + }
> if (cnt==1) {
> i = match;
> opt = arg;
prev parent reply other threads:[~2018-04-26 20:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-26 10:46 Szabolcs Nagy
2018-04-26 14:50 ` Rich Felker
2018-04-26 20:17 ` Szabolcs Nagy [this message]
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=20180426201713.GS4418@port70.net \
--to=nsz@port70.net \
--cc=musl@lists.openwall.com \
/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/musl/
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).