* posix/getopt.c (_getopt_internal_r): Remove old POSIX-demanded

error message.  POSIX today does not require the messages to be in
	a specific form.  Suggested by Jim Meyering <jim@meyering.net>.
This commit is contained in:
Ulrich Drepper 2008-03-29 20:20:00 +00:00
parent 1d20f7f834
commit 1e489af957
2 changed files with 9 additions and 19 deletions

View File

@ -1,5 +1,9 @@
2008-03-29 Ulrich Drepper <drepper@redhat.com>
* posix/getopt.c (_getopt_internal_r): Remove old POSIX-demanded
error message. POSIX today does not require the messages to be in
a specific form. Suggested by Jim Meyering <jim@meyering.net>.
[BZ #5979]
* sunrpc/auth_unix.c: Unify printed strings.
* sunrpc/clnt_tcp.c: Likewise.

View File

@ -792,30 +792,16 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
if (print_errors)
{
#if defined _LIBC && defined USE_IN_LIBIO
char *buf;
int n;
char *buf;
int n;
#endif
if (d->__posixly_correct)
{
#if defined _LIBC && defined USE_IN_LIBIO
n = __asprintf (&buf, _("%s: illegal option -- '%c'\n"),
argv[0], c);
n = __asprintf (&buf, _("%s: invalid option -- '%c'\n"),
argv[0], c);
#else
fprintf (stderr, _("%s: illegal option -- '%c'\n"), argv[0],
c);
fprintf (stderr, _("%s: invalid option -- '%c'\n"), argv[0], c);
#endif
}
else
{
#if defined _LIBC && defined USE_IN_LIBIO
n = __asprintf (&buf, _("%s: invalid option -- '%c'\n"),
argv[0], c);
#else
fprintf (stderr, _("%s: invalid option -- '%c'\n"), argv[0],
c);
#endif
}
#if defined _LIBC && defined USE_IN_LIBIO
if (n >= 0)