JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* libc/getopt.c (getopt_internal): Set optreset according to optind

Browse Source 
setting earlier.  Reevaluate POSIXLY_CORRECT if optreset is set to !0.
	Handle a leading '-' in options independently of posixly_correct.
This commit is contained in:
Corinna Vinschen
2009-12-14 10:47:25 +00:00
parent cfc4fc9deb
commit 5d5594597e
2 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@@ -1,3 +1,9 @@
2009-12-14 Corinna Vinschen <corinna@vinschen.de>
* libc/getopt.c (getopt_internal): Set optreset according to optind
setting earlier. Reevaluate POSIXLY_CORRECT if optreset is set to !0.
Handle a leading '-' in options independently of posixly_correct.
2009-12-09 Christopher Faylor <me+cygwin@cgf.cx> 2009-12-09 Christopher Faylor <me+cygwin@cgf.cx>
* fhandler_fifo.cc (fhandler_fifo::open): Avoid resetting errno after * fhandler_fifo.cc (fhandler_fifo::open): Avoid resetting errno after

29
winsup/cygwin/libc/getopt.c
View File

@@ -303,19 +303,6 @@ getopt_internal(int nargc, char * const *nargv, const char *options,
if (options == NULL) if (options == NULL)
return (-1); return (-1);
/*
* Disable GNU extensions if POSIXLY_CORRECT is set or options
* string begins with a '+'.
*/
if (posixly_correct == -1)
posixly_correct = (getenv("POSIXLY_CORRECT") != NULL);
if (posixly_correct || *options == '+')
flags &= ~FLAG_PERMUTE;
else if (*options == '-')
flags |= FLAG_ALLARGS;
if (*options == '+' || *options == '-')
options++;
/* /*
* XXX Some GNU programs (like cvs) set optind to 0 instead of * XXX Some GNU programs (like cvs) set optind to 0 instead of
* XXX using optreset. Work around this braindamage. * XXX using optreset. Work around this braindamage.
@@ -323,6 +310,22 @@ getopt_internal(int nargc, char * const *nargv, const char *options,
if (optind == 0) if (optind == 0)
optind = optreset = 1; optind = optreset = 1;
/*
* Disable GNU extensions if POSIXLY_CORRECT is set or options
* string begins with a '+'.
*
* CV, 2009-12-14: Check POSIXLY_CORRECT anew if optind == 0 or
* optreset != 0 for GNU compatibility.
*/
if (posixly_correct == -1 || optreset != 0)
posixly_correct = (getenv("POSIXLY_CORRECT") != NULL);
if (*options == '-')
flags |= FLAG_ALLARGS;
else if (posixly_correct || *options == '+')
flags &= ~FLAG_PERMUTE;
if (*options == '+' || *options == '-')
options++;
optarg = NULL; optarg = NULL;
if (optreset) if (optreset)
nonopt_start = nonopt_end = -1; nonopt_start = nonopt_end = -1;