diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2010-04-04 22:48:55 -0700 |
|---|---|---|
| committer | Petr Baudis <pasky@ucw.cz> | 2010-05-12 03:21:11 +0200 |
| commit | ed5e4f5aac1d6a4c75d78548255a47881cdfb911 (patch) | |
| tree | 2ebbd81702fb64f27f46bb8bc9c4bf8f827c76c6 | |
| parent | 1845ca23091e5ff22e8620d5d72eccd9e2775324 (diff) | |
| download | glibc-ed5e4f5aac1d6a4c75d78548255a47881cdfb911.tar.gz glibc-ed5e4f5aac1d6a4c75d78548255a47881cdfb911.tar.xz glibc-ed5e4f5aac1d6a4c75d78548255a47881cdfb911.zip | |
Fix printing error messages in getopt.
(cherry picked from commit 247fdc8ee68cf49cd808becce56b2e923b4f776b)
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | posix/getopt.c | 25 |
2 files changed, 17 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog index 44659bbf19..2941812648 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-04-04 Ulrich Drepper <drepper@redhat.com> + [BZ #11043] + * posix/getopt.c (_getopt_internal_r): Fix arguments printed in error + messages. + [BZ #11070] * resolv/netdb.h: Declare iruserok and iruserok_af. diff --git a/posix/getopt.c b/posix/getopt.c index a7f0b54857..88acff0e2f 100644 --- a/posix/getopt.c +++ b/posix/getopt.c @@ -2,7 +2,8 @@ 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 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. 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; if (__asprintf (&buf, _("\ -%s: option '%s' requires an argument\n"), - argv[0], argv[d->optind - 1]) >= 0) +%s: option '--%s' requires an argument\n"), + argv[0], pfound->name) >= 0) { _IO_flockfile (stderr); @@ -697,8 +698,8 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring, } #else fprintf (stderr, - _("%s: option '%s' requires an argument\n"), - argv[0], argv[d->optind - 1]); + _("%s: option '--%s' requires an argument\n"), + argv[0], pfound->name); #endif } d->__nextchar += strlen (d->__nextchar); @@ -922,7 +923,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring, char *buf; if (__asprintf (&buf, _("%s: option '-W %s' is ambiguous\n"), - argv[0], argv[d->optind]) >= 0) + argv[0], d->optarg) >= 0) { _IO_flockfile (stderr); @@ -938,7 +939,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring, } #else fprintf (stderr, _("%s: option '-W %s' is ambiguous\n"), - argv[0], argv[d->optind]); + argv[0], d->optarg); #endif } d->__nextchar += strlen (d->__nextchar); @@ -1001,8 +1002,8 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring, char *buf; if (__asprintf (&buf, _("\ -%s: option '%s' requires an argument\n"), - argv[0], argv[d->optind - 1]) >= 0) +%s: option '-W %s' requires an argument\n"), + argv[0], pfound->name) >= 0) { _IO_flockfile (stderr); @@ -1018,9 +1019,9 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring, free (buf); } #else - fprintf (stderr, - _("%s: option '%s' requires an argument\n"), - argv[0], argv[d->optind - 1]); + fprintf (stderr, _("\ +%s: option '-W %s' requires an argument\n"), + argv[0], pfound->name); #endif } d->__nextchar += strlen (d->__nextchar); |