qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix printing error messages in getopt.

This commit is contained in:
Ulrich Drepper 2010-04-04 22:48:55 -07:00
parent 2cd9670885
commit 247fdc8ee6
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2010-04-04 Ulrich Drepper <drepper@redhat.com> 2010-04-04 Ulrich Drepper <drepper@redhat.com>
[BZ #11043]
* posix/getopt.c (_getopt_internal_r): Fix arguments printed in error
messages.
[BZ #11070] [BZ #11070]
* resolv/netdb.h: Declare iruserok and iruserok_af. * resolv/netdb.h: Declare iruserok and iruserok_af.

25
posix/getopt.c
View File

@ -2,7 +2,8 @@
NOTE: getopt is part of the C library, so if you don't know what NOTE: getopt is part of the C library, so if you don't know what
"Keep this file name-space clean" means, talk to drepper@gnu.org "Keep this file name-space clean" means, talk to drepper@gnu.org
before changing it! before changing it!
Copyright (C) 1987-1996,1998-2004,2008,2009 Free Software Foundation, Inc. Copyright (C) 1987-1996,1998-2004,2008,2009,2010
Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -679,8 +680,8 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
char *buf; char *buf;
if (__asprintf (&buf, _("\ if (__asprintf (&buf, _("\
%s: option '%s' requires an argument\n"), %s: option '--%s' requires an argument\n"),
argv[0], argv[d->optind - 1]) >= 0) argv[0], pfound->name) >= 0)
{ {
_IO_flockfile (stderr); _IO_flockfile (stderr);
@ -697,8 +698,8 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
} }
#else #else
fprintf (stderr, fprintf (stderr,
_("%s: option '%s' requires an argument\n"), _("%s: option '--%s' requires an argument\n"),
argv[0], argv[d->optind - 1]); argv[0], pfound->name);
#endif #endif
} }
d->__nextchar += strlen (d->__nextchar); d->__nextchar += strlen (d->__nextchar);
@ -922,7 +923,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
char *buf; char *buf;
if (__asprintf (&buf, _("%s: option '-W %s' is ambiguous\n"), if (__asprintf (&buf, _("%s: option '-W %s' is ambiguous\n"),
argv[0], argv[d->optind]) >= 0) argv[0], d->optarg) >= 0)
{ {
_IO_flockfile (stderr); _IO_flockfile (stderr);
@ -938,7 +939,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
} }
#else #else
fprintf (stderr, _("%s: option '-W %s' is ambiguous\n"), fprintf (stderr, _("%s: option '-W %s' is ambiguous\n"),
argv[0], argv[d->optind]); argv[0], d->optarg);
#endif #endif
} }
d->__nextchar += strlen (d->__nextchar); d->__nextchar += strlen (d->__nextchar);
@ -1001,8 +1002,8 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
char *buf; char *buf;
if (__asprintf (&buf, _("\ if (__asprintf (&buf, _("\
%s: option '%s' requires an argument\n"), %s: option '-W %s' requires an argument\n"),
argv[0], argv[d->optind - 1]) >= 0) argv[0], pfound->name) >= 0)
{ {
_IO_flockfile (stderr); _IO_flockfile (stderr);
@ -1018,9 +1019,9 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
free (buf); free (buf);
} }
#else #else
fprintf (stderr, fprintf (stderr, _("\
_("%s: option '%s' requires an argument\n"), %s: option '-W %s' requires an argument\n"),
argv[0], argv[d->optind - 1]); argv[0], pfound->name);
#endif #endif
} }
d->__nextchar += strlen (d->__nextchar); d->__nextchar += strlen (d->__nextchar);