libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

newlib: getopt now permutes multi-flag options correctly 

Previously, "test 1 2 3 -a -b -c"  was permuted to "test -a -b -c 1 2 3",
but "test 1 2 3 -abc" was left as "test 1 2 3 -abc".

Signed-off-by: Thomas Kindler <mail+newlib@t-kindler.de>
This commit is contained in:
Thomas Kindler 2018-05-29 14:04:56 +02:00 committed by Corinna Vinschen
parent ebc9171ede
commit 9dd3c3b0ad
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
newlib/libc/include/getopt.h
View File

@ -129,7 +129,7 @@ extern "C"
/* The GETOPT_DATA_INITIALIZER macro is used to initialize a statically- /* The GETOPT_DATA_INITIALIZER macro is used to initialize a statically-
allocated variable of type struct getopt_data. */ allocated variable of type struct getopt_data. */
#define GETOPT_DATA_INITIALIZER {0,0,0,0,0} #define GETOPT_DATA_INITIALIZER {0,0,0,0,0,0,0}
/* These #defines are to make accessing the reentrant functions easier. */ /* These #defines are to make accessing the reentrant functions easier. */
#define getopt_r __getopt_r #define getopt_r __getopt_r
@ -142,6 +142,7 @@ extern "C"
{ {
char *optarg; char *optarg;
int optind, opterr, optopt, optwhere; int optind, opterr, optopt, optwhere;
int permute_from, num_nonopts;
} getopt_data; } getopt_data;
#endif /* __need_getopt_newlib */ #endif /* __need_getopt_newlib */

33
newlib/libc/stdlib/getopt.c
View File

@ -118,6 +118,8 @@ int optopt = '?';
/* static variables */ /* static variables */
static int optwhere = 0; static int optwhere = 0;
static int permute_from = 0;
static int num_nonopts = 0;
/* functions */ /* functions */
@ -163,6 +165,8 @@ read_globals (struct getopt_data *data)
data->opterr = opterr; data->opterr = opterr;
data->optopt = optopt; data->optopt = optopt;
data->optwhere = optwhere; data->optwhere = optwhere;
data->permute_from = permute_from;
data->num_nonopts = num_nonopts;
} }
/* write_globals: write the values into the globals from a getopt_data /* write_globals: write the values into the globals from a getopt_data
@ -175,6 +179,8 @@ write_globals (struct getopt_data *data)
opterr = data->opterr; opterr = data->opterr;
optopt = data->optopt; optopt = data->optopt;
optwhere = data->optwhere; optwhere = data->optwhere;
permute_from = data->permute_from;
num_nonopts = data->num_nonopts;
} }
/* getopt_internal: the function that does all the dirty work /* getopt_internal: the function that does all the dirty work
@ -186,8 +192,6 @@ getopt_internal (int argc, char *const argv[], const char *shortopts,
struct getopt_data *data) struct getopt_data *data)
{ {
GETOPT_ORDERING_T ordering = PERMUTE; GETOPT_ORDERING_T ordering = PERMUTE;
size_t permute_from = 0;
int num_nonopts = 0;
int optindex = 0; int optindex = 0;
size_t match_chars = 0; size_t match_chars = 0;
char *possible_arg = 0; char *possible_arg = 0;
@ -209,7 +213,12 @@ getopt_internal (int argc, char *const argv[], const char *shortopts,
/* if this is our first time through */ /* if this is our first time through */
if (data->optind == 0) if (data->optind == 0)
data->optind = data->optwhere = 1; {
data->optind = 1;
data->optwhere = 1;
data->permute_from = 0;
data->num_nonopts = 0;
}
/* define ordering */ /* define ordering */
if (shortopts != 0 && (*shortopts == '-' || *shortopts == '+')) if (shortopts != 0 && (*shortopts == '-' || *shortopts == '+'))
@ -237,24 +246,24 @@ getopt_internal (int argc, char *const argv[], const char *shortopts,
{ {
default: /* shouldn't happen */ default: /* shouldn't happen */
case PERMUTE: case PERMUTE:
permute_from = data->optind; data->permute_from = data->optind;
num_nonopts = 0; data->num_nonopts = 0;
while (!is_option (argv[data->optind], only)) while (!is_option (argv[data->optind], only))
{ {
data->optind++; data->optind++;
num_nonopts++; data->num_nonopts++;
} }
if (argv[data->optind] == 0) if (argv[data->optind] == 0)
{ {
/* no more options */ /* no more options */
data->optind = permute_from; data->optind = data->permute_from;
return EOF; return EOF;
} }
else if (strcmp (argv[data->optind], "--") == 0) else if (strcmp (argv[data->optind], "--") == 0)
{ {
/* no more options, but have to get `--' out of the way */ /* no more options, but have to get `--' out of the way */
permute (argv + permute_from, num_nonopts, 1); permute (argv + data->permute_from, data->num_nonopts, 1);
data->optind = permute_from + 1; data->optind = data->permute_from + 1;
return EOF; return EOF;
} }
break; break;
@ -426,10 +435,10 @@ getopt_internal (int argc, char *const argv[], const char *shortopts,
} }
/* do we have to permute or otherwise modify data->optind? */ /* do we have to permute or otherwise modify data->optind? */
if (ordering == PERMUTE && data->optwhere == 1 && num_nonopts != 0) if (ordering == PERMUTE && data->optwhere == 1 && data->num_nonopts != 0)
{ {
permute (argv + permute_from, num_nonopts, 1 + arg_next); permute (argv + data->permute_from, data->num_nonopts, 1 + arg_next);
data->optind = permute_from + 1 + arg_next; data->optind = data->permute_from + 1 + arg_next;
} }
else if (data->optwhere == 1) else if (data->optwhere == 1)
data->optind = data->optind + 1 + arg_next; data->optind = data->optind + 1 + arg_next;