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

* libc/stdlib/getopt.c (getopt_internal): Align handling of colon to

Browse Source 
SUSv4 requirements.
	(__getopt_long_r): Fix formatting.
This commit is contained in:
Corinna Vinschen 2012-10-16 19:11:48 +00:00
parent 1772168778
commit 3595a9c789
2 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
newlib/ChangeLog
View File

@ -1,3 +1,9 @@
2012-10-16 Gregory Pietsch <gpietsch@comcast.net>
* libc/stdlib/getopt.c (getopt_internal): Align handling of colon to
SUSv4 requirements.
(__getopt_long_r): Fix formatting.
2012-10-16 Corinna Vinschen <vinschen@redhat.com> 2012-10-16 Corinna Vinschen <vinschen@redhat.com>
* libc/stdio/vfprintf.c (__sbprintf): Fix comment. * libc/stdio/vfprintf.c (__sbprintf): Fix comment.

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

@ -71,6 +71,14 @@ The special argument `--' forces an end of option-scanning regardless of the
value of ordering. In the case of RETURN_IN_ORDER, only `--' can cause value of ordering. In the case of RETURN_IN_ORDER, only `--' can cause
getopt() and friends to return EOF with optind != argc. getopt() and friends to return EOF with optind != argc.
2012-08-26: Tried to make the error handling more sus4-like. The functions
return a colon if getopt() and friends detect a missing argument and the
first character of shortopts/optstring starts with a colon (`:'). If getopt()
and friends detect a missing argument and shortopts/optstring does not start
with a colon, the function returns a question mark (`?'). If it was a missing
argument to a short option, optopt is set to the character in question. The
colon goes after the ordering character (`+' or `-').
COPYRIGHT NOTICE AND DISCLAIMER: COPYRIGHT NOTICE AND DISCLAIMER:
Copyright (C) 1997 Gregory Pietsch Copyright (C) 1997 Gregory Pietsch
@ -185,6 +193,7 @@ getopt_internal (int argc, char *const argv[], const char *shortopts,
int has_arg = -1; int has_arg = -1;
char *cp = 0; char *cp = 0;
int arg_next = 0; int arg_next = 0;
int initial_colon = 0;
/* first, deal with silly parameters and easy stuff */ /* first, deal with silly parameters and easy stuff */
if (argc == 0 || argv == 0 || (shortopts == 0 && longopts == 0) if (argc == 0 || argv == 0 || (shortopts == 0 && longopts == 0)
@ -209,6 +218,13 @@ getopt_internal (int argc, char *const argv[], const char *shortopts,
else else
ordering = (getenv ("POSIXLY_CORRECT") != 0) ? REQUIRE_ORDER : PERMUTE; ordering = (getenv ("POSIXLY_CORRECT") != 0) ? REQUIRE_ORDER : PERMUTE;
/* check for initial colon in shortopts */
if (shortopts != 0 && *shortopts == ':')
{
++shortopts;
initial_colon = 1;
}
/* /*
* based on ordering, find our next option, if we're at the beginning of * based on ordering, find our next option, if we're at the beginning of
* one * one
@ -359,12 +375,18 @@ getopt_internal (int argc, char *const argv[], const char *shortopts,
{ {
fprintf (stderr, "%s: argument required for option `", argv[0]); fprintf (stderr, "%s: argument required for option `", argv[0]);
if (longopt_match >= 0) if (longopt_match >= 0)
fprintf (stderr, "--%s'\n", longopts[longopt_match].name); {
fprintf (stderr, "--%s'\n", longopts[longopt_match].name);
data->optopt = initial_colon ? ':' : '\?';
}
else else
fprintf (stderr, "-%c'\n", *cp); {
fprintf (stderr, "-%c'\n", *cp);
data->optopt = *cp;
}
} }
data->optind++; data->optind++;
return (data->optopt = ':'); return initial_colon ? ':' : '\?';
} }
else else
{ {
@ -460,8 +482,8 @@ __getopt_r (int argc, char *const argv[], const char *optstring,
int int
__getopt_long_r (int argc, char *const argv[], const char *shortopts, __getopt_long_r (int argc, char *const argv[], const char *shortopts,
const struct option *longopts, int *longind, const struct option *longopts, int *longind,
struct getopt_data *data) struct getopt_data *data)
{ {
return getopt_internal (argc, argv, shortopts, longopts, longind, 0, data); return getopt_internal (argc, argv, shortopts, longopts, longind, 0, data);
} }