From: Rich Felker <dalias@libc.org>
To: musl@lists.openwall.com
Subject: Re: [PATCH] getopt: fix optional argument processing
Date: Tue, 21 Oct 2014 07:35:39 -0400 [thread overview]
Message-ID: <20141021113539.GC22465@brightrain.aerifal.cx> (raw)
In-Reply-To: <1413889408-28223-1-git-send-email-nbd@openwrt.org>
On Tue, Oct 21, 2014 at 01:03:28PM +0200, Felix Fietkau wrote:
> Processing an option character with optional argument fails if the
> option is last on the command line. This happens because the
> if (optind >= argc) check runs first before testing for optional
> argument.
> ---
> src/misc/getopt.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/src/misc/getopt.c b/src/misc/getopt.c
> index 8a2e4d5..7ce3789 100644
> --- a/src/misc/getopt.c
> +++ b/src/misc/getopt.c
> @@ -55,7 +55,9 @@ int getopt(int argc, char * const argv[], const char *optstring)
> return '?';
> }
> if (optstring[i+1] == ':') {
> + if (optstring[i+2] == ':') optarg = 0;
> if (optind >= argc) {
> + if (optstring[i+2] == ':') return c;
Couldn't this be:
if (optstring[i+2] == ':') optarg = 0;
else if (optind >= argc) {
I'm not sure if that's nicer but it eliminates the additional return
path you're adding.
Rich
prev parent reply other threads:[~2014-10-21 11:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-21 11:03 Felix Fietkau
2014-10-21 11:35 ` Rich Felker [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=20141021113539.GC22465@brightrain.aerifal.cx \
--to=dalias@libc.org \
--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).