From mboxrd@z Thu Jan  1 00:00:00 1970
X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/10646
Path: news.gmane.org!.POSTED!not-for-mail
From: Rich Felker <dalias@libc.org>
Newsgroups: gmane.linux.lib.musl.general
Subject: Re: getopt_long_only
Date: Thu, 20 Oct 2016 01:54:00 -0400
Message-ID: <20161020055400.GO19318@brightrain.aerifal.cx>
References: <002301d22560$0d79a610$286cf230$@codeaurora.org>
 <CAFhhQJTNHWzQG6qvW9OcFQN7L1w=v=sE2=Upv1fN9KF=GYP1Tw@mail.gmail.com>
 <20161013184019.GV19318@brightrain.aerifal.cx>
Reply-To: musl@lists.openwall.com
NNTP-Posting-Host: blaine.gmane.org
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Trace: blaine.gmane.org 1476942871 10073 195.159.176.226 (20 Oct 2016 05:54:31 GMT)
X-Complaints-To: usenet@blaine.gmane.org
NNTP-Posting-Date: Thu, 20 Oct 2016 05:54:31 +0000 (UTC)
User-Agent: Mutt/1.5.21 (2010-09-15)
To: musl@lists.openwall.com
Original-X-From: musl-return-10659-gllmg-musl=m.gmane.org@lists.openwall.com Thu Oct 20 07:54:24 2016
Return-path: <musl-return-10659-gllmg-musl=m.gmane.org@lists.openwall.com>
Envelope-to: gllmg-musl@m.gmane.org
Original-Received: from mother.openwall.net ([195.42.179.200])
	by blaine.gmane.org with smtp (Exim 4.84_2)
	(envelope-from <musl-return-10659-gllmg-musl=m.gmane.org@lists.openwall.com>)
	id 1bx6Iu-0000Ge-EO
	for gllmg-musl@m.gmane.org; Thu, 20 Oct 2016 07:54:12 +0200
Original-Received: (qmail 24571 invoked by uid 550); 20 Oct 2016 05:54:12 -0000
Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm
Precedence: bulk
List-Post: <mailto:musl@lists.openwall.com>
List-Help: <mailto:musl-help@lists.openwall.com>
List-Unsubscribe: <mailto:musl-unsubscribe@lists.openwall.com>
List-Subscribe: <mailto:musl-subscribe@lists.openwall.com>
List-ID: <musl.lists.openwall.com>
Original-Received: (qmail 24552 invoked from network); 20 Oct 2016 05:54:12 -0000
Content-Disposition: inline
In-Reply-To: <20161013184019.GV19318@brightrain.aerifal.cx>
Original-Sender: Rich Felker <dalias@aerifal.cx>
Xref: news.gmane.org gmane.linux.lib.musl.general:10646
Archived-At: <http://permalink.gmane.org/gmane.linux.lib.musl.general/10646>

On Thu, Oct 13, 2016 at 02:40:19PM -0400, Rich Felker wrote:
> On Thu, Oct 13, 2016 at 01:43:28PM -0400, Daniel Sabogal wrote:
> > On Thu, Oct 13, 2016 at 10:42 AM, Sidney Manning <sidneym@codeaurora.org> wrote:
> > > I may have found an issue with this API.  When a double hyphen is
> > > encountered the API is supposed to return a -1 but I'm seeing a '?'.
> > >
> > > My reference is from the Solaris docs which say: "The special option "--"
> > > can be used to delimit the end of the options; when it is encountered, -1 is
> > > returned and "--" is skipped.  I attached a test case to show the problem.
> > >
> > > I made the following change it will cause the code to punt to getopt when
> > > just  a "--" is found:
> > > argv[optind][0] == '-'
> > > argv[optind][1] == '-'
> > > argv[optind][2] == NULL
> > >
> > > diff --git a/src/misc/getopt_long.c b/src/misc/getopt_long.c
> > > index 480c001..9764f56 100644
> > > --- a/src/misc/getopt_long.c
> > > +++ b/src/misc/getopt_long.c
> > > @@ -53,7 +53,7 @@ static int __getopt_long_core(int argc, char *const *argv,
> > > con
> > >  {
> > >         optarg = 0;
> > >         if (longopts && argv[optind][0] == '-' &&
> > > -               ((longonly && argv[optind][1]) ||
> > > +               ((longonly && argv[optind][1]) &&
> > >                  (argv[optind][1] == '-' && argv[optind][2])))
> > >         {
> > >                 int colon =
> > > optstring[optstring[0]=='+'||optstring[0]=='-']==':'
> > 
> > This will break getopt_long() since the entire condition won't hold
> > whenever !longonly.
> > 
> > I think just changing the longonly case to the following is sufficient.
> > 
> > (longonly && argv[optind][1] && argv[optind][1] != '-')
> 
> Yes, that looks like the correct fix.

Has anyone tested and confirmed this?

Rich