mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-01 12:19:28 +00:00
Code Issues Releases Activity

Be more GNU compatible:

Browse Source 
don't be greedy on the GNU "::" extension when arg separated by whitespace
and POSIX_CORRECTLY is set. From POSIX point of view this is unclear
situation, so minimal assumption looks right.
This commit is contained in:
Andrey A. Chernov 2006-09-22 17:01:38 +00:00
parent 4a75dc2585
commit f27c7b4713
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=162555
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/libc/stdlib/getopt_long.c
View File

@ -558,7 +558,6 @@ getopt_internal(int nargc, char * const *nargv, const char *options,
optarg = NULL;
if (*place) /* no white space */
optarg = place;
/* XXX: disable test for :: if PC? (GNU doesn't) */
else if (oli[1] != ':') { /* arg not optional */
if (++optind >= nargc) { /* no arg */
place = EMSG;
@ -568,7 +567,10 @@ getopt_internal(int nargc, char * const *nargv, const char *options,
return (BADARG);
} else
optarg = nargv[optind];
} else if (!(flags & FLAG_PERMUTE)) {
}
#ifndef GNU_COMPATIBLE
/* XXX: disable test for :: if PC? (GNU doesn't) */
else if (!(flags & FLAG_PERMUTE)) {
/*
* If permutation is disabled, we can accept an
* optional arg separated by whitespace so long
@ -577,6 +579,7 @@ getopt_internal(int nargc, char * const *nargv, const char *options,
if (optind + 1 < nargc && *nargv[optind + 1] != '-')
optarg = nargv[++optind];
}
#endif
place = EMSG;
++optind;
}