[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r5451 - in /fsf/trunk/libc: ./ elf/ hurd/ inet/ localedata/ localedata/locales/ po/ posix/ stdlib/ sysdeps/mach/hurd/i386/ s...
- To: commits@xxxxxxxxxx
- Subject: [commits] r5451 - in /fsf/trunk/libc: ./ elf/ hurd/ inet/ localedata/ localedata/locales/ po/ posix/ stdlib/ sysdeps/mach/hurd/i386/ s...
- From: eglibc@xxxxxxxxxx
- Date: Sun, 09 Mar 2008 08:04:01 -0000
Author: eglibc
Date: Sun Mar 9 00:04:00 2008
New Revision: 5451
Log:
Import glibc-mainline for 2008-03-09
Added:
fsf/trunk/libc/stdlib/tst-strtod6.c
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/elf/Makefile
fsf/trunk/libc/hurd/hurdsig.c
fsf/trunk/libc/inet/inet6_opt.c
fsf/trunk/libc/localedata/ChangeLog
fsf/trunk/libc/localedata/locales/pt_PT
fsf/trunk/libc/po/be.po
fsf/trunk/libc/po/bg.po
fsf/trunk/libc/po/ca.po
fsf/trunk/libc/po/cs.po
fsf/trunk/libc/po/da.po
fsf/trunk/libc/po/de.po
fsf/trunk/libc/po/es.po
fsf/trunk/libc/po/fr.po
fsf/trunk/libc/po/hr.po
fsf/trunk/libc/po/ko.po
fsf/trunk/libc/po/nl.po
fsf/trunk/libc/po/rw.po
fsf/trunk/libc/po/sk.po
fsf/trunk/libc/po/sv.po
fsf/trunk/libc/po/tr.po
fsf/trunk/libc/po/zh_CN.po
fsf/trunk/libc/po/zh_TW.po
fsf/trunk/libc/posix/getopt.c
fsf/trunk/libc/stdlib/Makefile
fsf/trunk/libc/stdlib/strtod_l.c
fsf/trunk/libc/sysdeps/mach/hurd/i386/trampoline.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/dl-sysdep.c
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sun Mar 9 00:04:00 2008
@@ -1,3 +1,55 @@
+2008-03-08 Roland McGrath <roland@xxxxxxxx>
+
+ * hurd/hurdsig.c (_hurd_internal_post_signal): When normal rules would
+ ignore a signal that came from a machine exception, treat it as a
+ fatal core-dump signal instead.
+ Reported by Samuel Thibault <samuel.thibault@xxxxxxxxxxxx>.
+
+ * sysdeps/mach/hurd/i386/trampoline.c (_hurd_setup_sighandler):
+ Clear DF bit in thread state's eflags.
+ Reported by Samuel Thibault <samuel.thibault@xxxxxxxxxxxx>.
+
+2008-03-08 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ [BZ #5774]
+ * stdlib/strtod_l.c (____STRTOF_INTERNAL): Consume closing brace
+ of NAN(...) sequence.
+ * stdlib/Makefile (tests): Add tst-strtod6.
+ * stdlib/tst-strtod6.c: New file.
+
+ * inet/inet6_opt.c (inet6_opt_init): Check extlen for overflow.
+
+ [BZ #5762]
+ * posix/getopt.c (_getopt_internal_r): Clarify error message by
+ putting offending option character in quotes. Clean up error
+ messages.
+ * po/be.po: Adjust msgstr in translation file.
+ * po/bg.po: Likewise.
+ * po/ca.po: Likewise.
+ * po/cs.po: Likewise.
+ * po/da.po: Likewise.
+ * po/de.po: Likewise.
+ * po/es.po: Likewise.
+ * po/fr.po: Likewise.
+ * po/hr.po: Likewise.
+ * po/ko.po: Likewise.
+ * po/nl.po: Likewise.
+ * po/rw.po: Likewise.
+ * po/sk.po: Likewise.
+ * po/sv.po: Likewise.
+ * po/tr.po: Likewise.
+ * po/zh_CN.po: Likewise.
+ * po/zh_TW.po: Likewise.
+
+ [BZ #5760]
+ * inet/inet6_opt.c (inet6_opt_init): Fix ip6h_len computation.
+ Patch by Roland Bless <roland@xxxxxxxx>.
+
+ * sysdeps/unix/sysv/linux/dl-sysdep.c: Avoid unnecessary code for
+ .o file.
+ * elf/Makefile (routines): Add dl-sysdep.
+ (elide-routines.os): Likewise.
+
2008-03-07 Ulrich Drepper <drepper@xxxxxxxxxx>
[BZ #5786]
Modified: fsf/trunk/libc/elf/Makefile
==============================================================================
--- fsf/trunk/libc/elf/Makefile (original)
+++ fsf/trunk/libc/elf/Makefile Sun Mar 9 00:04:00 2008
@@ -1,4 +1,4 @@
-# Copyright (C) 1995-2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 1995-2007, 2008 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
@@ -23,7 +23,7 @@
headers = elf.h bits/elfclass.h link.h bits/link.h
routines = $(dl-routines) dl-support dl-iteratephdr \
dl-addr enbl-secure dl-profstub \
- dl-origin dl-libc dl-sym dl-tsd
+ dl-origin dl-libc dl-sym dl-tsd dl-sysdep
# The core dynamic linking functions are in libc for the static and
# profiled libraries.
@@ -33,7 +33,8 @@
execstack caller open close trampoline)
all-dl-routines = $(dl-routines) $(sysdep-dl-routines)
# But they are absent from the shared libc, because that code is in ld.so.
-elide-routines.os = $(all-dl-routines) dl-support enbl-secure dl-origin
+elide-routines.os = $(all-dl-routines) dl-support enbl-secure dl-origin \
+ dl-sysdep
shared-only-routines += dl-caller
# ld.so uses those routines, plus some special stuff for being the program
Modified: fsf/trunk/libc/hurd/hurdsig.c
==============================================================================
--- fsf/trunk/libc/hurd/hurdsig.c (original)
+++ fsf/trunk/libc/hurd/hurdsig.c Sun Mar 9 00:04:00 2008
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,92,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002,2005
+/* Copyright (C) 1991,92,93,94,95,96,97,98,99,2000,2001,2002,2005,2008
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -743,6 +743,11 @@
break;
case ignore:
+ if (detail->exc)
+ /* Blocking or ignoring a machine exception is fatal.
+ Otherwise we could just spin on the faulting instruction. */
+ goto fatal;
+
/* Nobody cares about this signal. If there was a call to resume
above in SIGCONT processing and we've left a thread suspended,
now's the time to set it going. */
@@ -759,6 +764,8 @@
Nothing to do but die; BSD gets SIGILL in this case. */
detail->code = signo; /* XXX ? */
signo = SIGILL;
+
+ fatal:
act = core;
/* FALLTHROUGH */
Modified: fsf/trunk/libc/inet/inet6_opt.c
==============================================================================
--- fsf/trunk/libc/inet/inet6_opt.c (original)
+++ fsf/trunk/libc/inet/inet6_opt.c Sun Mar 9 00:04:00 2008
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2006.
@@ -34,12 +34,16 @@
{
if (extbuf != NULL)
{
- if (extlen <= 0 || (extlen % 8) != 0)
+ if (extlen <= 0 || (extlen % 8) != 0 || extlen > 256 * 8)
return -1;
/* Fill in the length in units of 8 octets. */
struct ip6_hbh *extp = (struct ip6_hbh *) extbuf;
- extp->ip6h_len = extlen / 8;
+
+ /* RFC 2460 requires that the header extension length is the
+ length of the option header in 8-byte units, not including
+ the first 8 bytes. Hence we have to subtract one. */
+ extp->ip6h_len = extlen / 8 - 1;
}
return sizeof (struct ip6_hbh);
Modified: fsf/trunk/libc/localedata/ChangeLog
==============================================================================
--- fsf/trunk/libc/localedata/ChangeLog (original)
+++ fsf/trunk/libc/localedata/ChangeLog Sun Mar 9 00:04:00 2008
@@ -1,3 +1,8 @@
+2008-03-08 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ [BZ #5602]
+ * locales/pt_PT: Fix mon_decimal_point.
+
2008-03-07 Ulrich Drepper <drepper@xxxxxxxxxx>
[BZ #5777]
Modified: fsf/trunk/libc/localedata/locales/pt_PT
==============================================================================
--- fsf/trunk/libc/localedata/locales/pt_PT (original)
+++ fsf/trunk/libc/localedata/locales/pt_PT Sun Mar 9 00:04:00 2008
@@ -65,7 +65,7 @@
LC_MONETARY
int_curr_symbol "<U0045><U0055><U0052><U0020>"
currency_symbol "<U20AC>"
-mon_decimal_point "<U0024>"
+mon_decimal_point "<U002C>"
mon_thousands_sep "<U002E>"
mon_grouping 3;3
positive_sign ""
Modified: fsf/trunk/libc/po/be.po
==============================================================================
--- fsf/trunk/libc/po/be.po (original)
+++ fsf/trunk/libc/po/be.po Sun Mar 9 00:04:00 2008
@@ -3448,59 +3448,59 @@
#: posix/getopt.c:692 posix/getopt.c:704
#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s' is ambiguous\n"
msgstr ""
#: posix/getopt.c:737 posix/getopt.c:741
#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+msgid "%s: option '--%s' doesn't allow an argument\n"
msgstr ""
#: posix/getopt.c:750 posix/getopt.c:755
#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgid "%s: option '%c%s' doesn't allow an argument\n"
msgstr ""
#: posix/getopt.c:791 posix/getopt.c:804 posix/getopt.c:1093
#: posix/getopt.c:1106
#, c-format
-msgid "%s: option `%s' requires an argument\n"
+msgid "%s: option '%s' requires an argument\n"
msgstr ""
#: posix/getopt.c:842 posix/getopt.c:845
#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+msgid "%s: unrecognized option '--%s'\n"
msgstr ""
#: posix/getopt.c:853 posix/getopt.c:856
#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+msgid "%s: unrecognized option '%c%s'\n"
msgstr ""
#: posix/getopt.c:903 posix/getopt.c:906
#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: недапушчальны выраб -- %c\n"
+msgid "%s: illegal option -- '%c'\n"
+msgstr "%s: недапушчальны выраб -- '%c'\n"
#: posix/getopt.c:912 posix/getopt.c:915
#, c-format
-msgid "%s: invalid option -- %c\n"
+msgid "%s: invalid option -- '%c'\n"
msgstr ""
#: posix/getopt.c:962 posix/getopt.c:973 posix/getopt.c:1159
#: posix/getopt.c:1172
#, c-format
-msgid "%s: option requires an argument -- %c\n"
+msgid "%s: option requires an argument -- '%c'\n"
msgstr ""
#: posix/getopt.c:1025 posix/getopt.c:1036
#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+msgid "%s: option '-W %s' is ambiguous\n"
msgstr ""
#: posix/getopt.c:1060 posix/getopt.c:1072
#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgid "%s: option '-W %s' doesn't allow an argument\n"
msgstr ""
#: posix/regcomp.c:136
Modified: fsf/trunk/libc/po/bg.po
==============================================================================
--- fsf/trunk/libc/po/bg.po (original)
+++ fsf/trunk/libc/po/bg.po Sun Mar 9 00:04:00 2008
@@ -4210,59 +4210,59 @@
#: posix/getopt.c:571 posix/getopt.c:587
#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s' is ambiguous\n"
msgstr ""
#: posix/getopt.c:620 posix/getopt.c:624
#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+msgid "%s: option '--%s' doesn't allow an argument\n"
msgstr ""
#: posix/getopt.c:633 posix/getopt.c:638
#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgid "%s: option '%c%s' doesn't allow an argument\n"
msgstr ""
#: posix/getopt.c:681 posix/getopt.c:700 posix/getopt.c:1016
#: posix/getopt.c:1035
#, c-format
-msgid "%s: option `%s' requires an argument\n"
+msgid "%s: option '%s' requires an argument\n"
msgstr ""
#: posix/getopt.c:738 posix/getopt.c:741
#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+msgid "%s: unrecognized option '--%s'\n"
msgstr ""
#: posix/getopt.c:749 posix/getopt.c:752
#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+msgid "%s: unrecognized option '%c%s'\n"
msgstr ""
#: posix/getopt.c:804 posix/getopt.c:807
#, c-format
-msgid "%s: illegal option -- %c\n"
+msgid "%s: illegal option -- '%c'\n"
msgstr ""
#: posix/getopt.c:813 posix/getopt.c:816
#, c-format
-msgid "%s: invalid option -- %c\n"
+msgid "%s: invalid option -- '%c'\n"
msgstr ""
#: posix/getopt.c:868 posix/getopt.c:884 posix/getopt.c:1088
#: posix/getopt.c:1106
#, c-format
-msgid "%s: option requires an argument -- %c\n"
+msgid "%s: option requires an argument -- '%c'\n"
msgstr ""
#: posix/getopt.c:937 posix/getopt.c:953
#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+msgid "%s: option '-W %s' is ambiguous\n"
msgstr ""
#: posix/getopt.c:977 posix/getopt.c:995
#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgid "%s: option '-W %s' doesn't allow an argument\n"
msgstr ""
#: posix/regcomp.c:135
Modified: fsf/trunk/libc/po/ca.po
==============================================================================
--- fsf/trunk/libc/po/ca.po (original)
+++ fsf/trunk/libc/po/ca.po Sun Mar 9 00:04:00 2008
@@ -4497,59 +4497,59 @@
#: posix/getopt.c:571 posix/getopt.c:587
#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s' is ambiguous\n"
msgstr "%s: l’opció «%s» és ambÃgua\n"
#: posix/getopt.c:620 posix/getopt.c:624
#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+msgid "%s: option '--%s' doesn't allow an argument\n"
msgstr "%s: l’opció «--%s» no admet arguments\n"
#: posix/getopt.c:633 posix/getopt.c:638
#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgid "%s: option '%c%s' doesn't allow an argument\n"
msgstr "%s: l’opció «%c%s» no admet arguments\n"
#: posix/getopt.c:681 posix/getopt.c:700 posix/getopt.c:1016
#: posix/getopt.c:1035
#, c-format
-msgid "%s: option `%s' requires an argument\n"
+msgid "%s: option '%s' requires an argument\n"
msgstr "%s: l’opció «%s» necessita un argument\n"
#: posix/getopt.c:738 posix/getopt.c:741
#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+msgid "%s: unrecognized option '--%s'\n"
msgstr "%s: l’opció «--%s» no és reconeguda\n"
#: posix/getopt.c:749 posix/getopt.c:752
#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+msgid "%s: unrecognized option '%c%s'\n"
msgstr "%s: l’opció «%c%s» no és reconeguda\n"
#: posix/getopt.c:804 posix/getopt.c:807
#, c-format
-msgid "%s: illegal option -- %c\n"
+msgid "%s: illegal option -- '%c'\n"
msgstr "%s: no es permet l’opció «%c»\n"
#: posix/getopt.c:813 posix/getopt.c:816
#, c-format
-msgid "%s: invalid option -- %c\n"
+msgid "%s: invalid option -- '%c'\n"
msgstr "%s: l’opció «%c» no és và lida\n"
#: posix/getopt.c:868 posix/getopt.c:884 posix/getopt.c:1088
#: posix/getopt.c:1106
#, c-format
-msgid "%s: option requires an argument -- %c\n"
+msgid "%s: option requires an argument -- '%c'\n"
msgstr "%s: l’opció «%c» necessita un argument\n"
#: posix/getopt.c:937 posix/getopt.c:953
#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+msgid "%s: option '-W %s' is ambiguous\n"
msgstr "%s: l’opció «-W %s» és ambÃgua\n"
#: posix/getopt.c:977 posix/getopt.c:995
#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgid "%s: option '-W %s' doesn't allow an argument\n"
msgstr "%s: l’opció «-W %s» no admet arguments\n"
#: posix/regcomp.c:135
Modified: fsf/trunk/libc/po/cs.po
==============================================================================
--- fsf/trunk/libc/po/cs.po (original)
+++ fsf/trunk/libc/po/cs.po Sun Mar 9 00:04:00 2008
@@ -4359,35 +4359,35 @@
#: posix/getopt.c:571 posix/getopt.c:587
#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s' is ambiguous\n"
msgstr "%s: pÅ™epÃnaÄ â€ž%s“ nenà jednoznaÄný\n"
#: posix/getopt.c:620 posix/getopt.c:624
#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+msgid "%s: option '--%s' doesn't allow an argument\n"
msgstr "%s: pÅ™epÃnaÄ â€ž--%s“ musà být zadán bez argumentu\n"
#: posix/getopt.c:633 posix/getopt.c:638
#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgid "%s: option '%c%s' doesn't allow an argument\n"
msgstr "%s: pÅ™epÃnaÄ â€ž%c%s“ musà být zadán bez argumentu\n"
#: posix/getopt.c:681 posix/getopt.c:700 posix/getopt.c:1016
#: posix/getopt.c:1035
#, c-format
-msgid "%s: option `%s' requires an argument\n"
+msgid "%s: option '%s' requires an argument\n"
msgstr "%s: pÅ™epÃnaÄ â€ž%s“ vyžaduje argument\n"
# ŘÃká, že žádný pÅ™epÃnaÄ takového jména nebyl nalezen.
#: posix/getopt.c:738 posix/getopt.c:741
#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+msgid "%s: unrecognized option '--%s'\n"
msgstr "%s: neznámý pÅ™epÃnaÄ â€ž--%s“\n"
# ŘÃká, že žádný pÅ™epÃnaÄ takového jména nebyl nalezen.
#: posix/getopt.c:749 posix/getopt.c:752
#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+msgid "%s: unrecognized option '%c%s'\n"
msgstr "%s: neznámý pÅ™epÃnaÄ â€ž%c%s“\n"
# RozdÃl mezi 'illegal option' a 'invalid option' nenà žádný. To která zpráva
@@ -4395,29 +4395,29 @@
# 'Illegal option' je POSIXové.
#: posix/getopt.c:804 posix/getopt.c:807
#, c-format
-msgid "%s: illegal option -- %c\n"
+msgid "%s: illegal option -- '%c'\n"
msgstr "%s: neznámý pÅ™epÃnaÄ -- %c\n"
# Vysvětlenà viz 'illegal option'
#: posix/getopt.c:813 posix/getopt.c:816
#, c-format
-msgid "%s: invalid option -- %c\n"
+msgid "%s: invalid option -- '%c'\n"
msgstr "%s: neznámý pÅ™epÃnaÄ -- %c\n"
#: posix/getopt.c:868 posix/getopt.c:884 posix/getopt.c:1088
#: posix/getopt.c:1106
#, c-format
-msgid "%s: option requires an argument -- %c\n"
+msgid "%s: option requires an argument -- '%c'\n"
msgstr "%s: pÅ™epÃnaÄ vyžaduje argument – %c\n"
#: posix/getopt.c:937 posix/getopt.c:953
#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+msgid "%s: option '-W %s' is ambiguous\n"
msgstr "%s: pÅ™epÃnaÄ â€ž-W %s“ nenà jednoznaÄný\n"
#: posix/getopt.c:977 posix/getopt.c:995
#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgid "%s: option '-W %s' doesn't allow an argument\n"
msgstr "%s: pÅ™epÃnaÄ â€ž-W %s“ musà být zadán bez argumentu\n"
# Nenalezeno
Modified: fsf/trunk/libc/po/da.po
==============================================================================
--- fsf/trunk/libc/po/da.po (original)
+++ fsf/trunk/libc/po/da.po Sun Mar 9 00:04:00 2008
@@ -3473,59 +3473,59 @@
#: posix/getopt.c:692 posix/getopt.c:704
#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s' is ambiguous\n"
msgstr "%s: flaget '%s' er flertydigt\n"
#: posix/getopt.c:737 posix/getopt.c:741
#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+msgid "%s: option '--%s' doesn't allow an argument\n"
msgstr "%s: flaget '--%s' tager ikke argumenter\n"
#: posix/getopt.c:750 posix/getopt.c:755
#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgid "%s: option '%c%s' doesn't allow an argument\n"
msgstr "%s: flaget '%c%s' tager ikke argumenter\n"
#: posix/getopt.c:791 posix/getopt.c:804 posix/getopt.c:1093
#: posix/getopt.c:1106
#, c-format
-msgid "%s: option `%s' requires an argument\n"
+msgid "%s: option '%s' requires an argument\n"
msgstr "%s: flaget '%s' skal have et argument\n"
#: posix/getopt.c:842 posix/getopt.c:845
#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+msgid "%s: unrecognized option '--%s'\n"
msgstr "%s: ukendt flag '--%s'\n"
#: posix/getopt.c:853 posix/getopt.c:856
#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+msgid "%s: unrecognized option '%c%s'\n"
msgstr "%s: ukendt flag '%c%s'\n"
#: posix/getopt.c:903 posix/getopt.c:906
#, c-format
-msgid "%s: illegal option -- %c\n"
+msgid "%s: illegal option -- '%c'\n"
msgstr "%s: ulovligt flag -- %c\n"
#: posix/getopt.c:912 posix/getopt.c:915
#, c-format
-msgid "%s: invalid option -- %c\n"
+msgid "%s: invalid option -- '%c'\n"
msgstr "%s: ugyldigt flag -- %c\n"
#: posix/getopt.c:962 posix/getopt.c:973 posix/getopt.c:1159
#: posix/getopt.c:1172
#, c-format
-msgid "%s: option requires an argument -- %c\n"
+msgid "%s: option requires an argument -- '%c'\n"
msgstr "%s: flaget skal have et argument -- %c\n"
#: posix/getopt.c:1025 posix/getopt.c:1036
#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+msgid "%s: option '-W %s' is ambiguous\n"
msgstr "%s: flaget '-W %s' er flertydigt\n"
#: posix/getopt.c:1060 posix/getopt.c:1072
#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgid "%s: option '-W %s' doesn't allow an argument\n"
msgstr "%s: flaget '-W %s' tager ikke argumenter\n"
#: posix/regcomp.c:136
Modified: fsf/trunk/libc/po/de.po
==============================================================================
--- fsf/trunk/libc/po/de.po (original)
+++ fsf/trunk/libc/po/de.po Sun Mar 9 00:04:00 2008
@@ -3590,59 +3590,59 @@
#: posix/getopt.c:692 posix/getopt.c:711
#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s' is ambiguous\n"
msgstr "%s: Die Option »%s« ist nicht eindeutig\n"
#: posix/getopt.c:744 posix/getopt.c:748
#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+msgid "%s: option '--%s' doesn't allow an argument\n"
msgstr "%s: Die Option »--%s« erlaubt kein Argument\n"
#: posix/getopt.c:757 posix/getopt.c:762
#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgid "%s: option '%c%s' doesn't allow an argument\n"
msgstr "%s: Die Option »%c%s« erlaubt kein Argument\n"
#: posix/getopt.c:807 posix/getopt.c:829 posix/getopt.c:1159
#: posix/getopt.c:1181
#, c-format
-msgid "%s: option `%s' requires an argument\n"
+msgid "%s: option '%s' requires an argument\n"
msgstr "%s: Die Option »%s« erfordert ein Argument\n"
#: posix/getopt.c:867 posix/getopt.c:870
#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+msgid "%s: unrecognized option '--%s'\n"
msgstr "%s: Unbekannte Option »--%s«\n"
#: posix/getopt.c:878 posix/getopt.c:881
#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+msgid "%s: unrecognized option '%c%s'\n"
msgstr "%s: Unbekannte Option »%c%s«\n"
#: posix/getopt.c:936 posix/getopt.c:939
#, c-format
-msgid "%s: illegal option -- %c\n"
+msgid "%s: illegal option -- '%c'\n"
msgstr "%s: Die Option ist nicht erlaubt -- »%c«\n"
#: posix/getopt.c:945 posix/getopt.c:948
#, c-format
-msgid "%s: invalid option -- %c\n"
+msgid "%s: invalid option -- '%c'\n"
msgstr "%s: Ungültige Option -- %c\n"
#: posix/getopt.c:1003 posix/getopt.c:1022 posix/getopt.c:1234
#: posix/getopt.c:1255
#, c-format
-msgid "%s: option requires an argument -- %c\n"
+msgid "%s: option requires an argument -- '%c'\n"
msgstr "%s: Diese Option benötigt ein Argument -- »%c«\n"
#: posix/getopt.c:1074 posix/getopt.c:1093
#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+msgid "%s: option '-W %s' is ambiguous\n"
msgstr "%s: Die Option »-W %s« ist nicht eindeutig\n"
#: posix/getopt.c:1117 posix/getopt.c:1138
#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgid "%s: option '-W %s' doesn't allow an argument\n"
msgstr "%s: Die Option »-W %s« erlaubt kein Argument\n"
#: posix/regcomp.c:150
Modified: fsf/trunk/libc/po/es.po
==============================================================================
--- fsf/trunk/libc/po/es.po (original)
+++ fsf/trunk/libc/po/es.po Sun Mar 9 00:04:00 2008
@@ -3920,38 +3920,38 @@
#: posix/getopt.c:692 posix/getopt.c:711
#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s' is ambiguous\n"
msgstr "%s: la opción `%s' es ambigua\n"
#: posix/getopt.c:744 posix/getopt.c:748
#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+msgid "%s: option '--%s' doesn't allow an argument\n"
msgstr "%s: la opción `--%s' no admite ningún argumento\n"
#: posix/getopt.c:757 posix/getopt.c:762
#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgid "%s: option '%c%s' doesn't allow an argument\n"
msgstr "%s: la opción `%c%s' no admite ningún argumento\n"
#: posix/getopt.c:807 posix/getopt.c:829 posix/getopt.c:1159
#: posix/getopt.c:1181
#, c-format
-msgid "%s: option `%s' requires an argument\n"
+msgid "%s: option '%s' requires an argument\n"
msgstr "%s: la opción `%s' requiere un argumento\n"
#: posix/getopt.c:867 posix/getopt.c:870
#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+msgid "%s: unrecognized option '--%s'\n"
msgstr "%s: opción no reconocida `--%s'\n"
#: posix/getopt.c:878 posix/getopt.c:881
#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+msgid "%s: unrecognized option '%c%s'\n"
msgstr "%s: opción no reconocida `%c%s'\n"
#: posix/getopt.c:936 posix/getopt.c:939
#, c-format
-msgid "%s: illegal option -- %c\n"
+msgid "%s: illegal option -- '%c'\n"
msgstr "%s: opción ilegal -- %c\n"
# ¿Qué tiene de malo "inválida"? sv
@@ -3970,23 +3970,23 @@
#
#: posix/getopt.c:945 posix/getopt.c:948
#, c-format
-msgid "%s: invalid option -- %c\n"
+msgid "%s: invalid option -- '%c'\n"
msgstr "%s: opción inválida -- %c\n"
#: posix/getopt.c:1003 posix/getopt.c:1022 posix/getopt.c:1234
#: posix/getopt.c:1255
#, c-format
-msgid "%s: option requires an argument -- %c\n"
+msgid "%s: option requires an argument -- '%c'\n"
msgstr "%s: la opción requiere un argumento --%c\n"
#: posix/getopt.c:1074 posix/getopt.c:1093
#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+msgid "%s: option '-W %s' is ambiguous\n"
msgstr "%s: la opción `-W %s' es ambigua\n"
#: posix/getopt.c:1117 posix/getopt.c:1138
#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgid "%s: option '-W %s' doesn't allow an argument\n"
msgstr "%s: la opción `-W %s' no admite ningún argumento\n"
#: posix/regcomp.c:150
Modified: fsf/trunk/libc/po/fr.po
==============================================================================
--- fsf/trunk/libc/po/fr.po (original)
+++ fsf/trunk/libc/po/fr.po Sun Mar 9 00:04:00 2008
@@ -4330,59 +4330,59 @@
#: posix/getopt.c:571 posix/getopt.c:587
#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s' is ambiguous\n"
msgstr "%s : l'option « %s » est ambiguë\n"
#: posix/getopt.c:620 posix/getopt.c:624
#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+msgid "%s: option '--%s' doesn't allow an argument\n"
msgstr "%s : l'option « --%s » ne permet pas d'argument\n"
#: posix/getopt.c:633 posix/getopt.c:638
#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgid "%s: option '%c%s' doesn't allow an argument\n"
msgstr "%s : l'option « %c%s » ne permet pas d'argument.\n"
#: posix/getopt.c:681 posix/getopt.c:700 posix/getopt.c:1016
#: posix/getopt.c:1035
#, c-format
-msgid "%s: option `%s' requires an argument\n"
+msgid "%s: option '%s' requires an argument\n"
msgstr "%s : l'option « %s » requiert un argument\n"
#: posix/getopt.c:738 posix/getopt.c:741
#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+msgid "%s: unrecognized option '--%s'\n"
msgstr "%s : option non reconnue « --%s »\n"
#: posix/getopt.c:749 posix/getopt.c:752
#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+msgid "%s: unrecognized option '%c%s'\n"
msgstr "%s : option non reconnue « %c%s »\n"
#: posix/getopt.c:804 posix/getopt.c:807
#, c-format
-msgid "%s: illegal option -- %c\n"
+msgid "%s: illegal option -- '%c'\n"
msgstr "%s : option non permise -- %c\n"
#: posix/getopt.c:813 posix/getopt.c:816
#, c-format
-msgid "%s: invalid option -- %c\n"
+msgid "%s: invalid option -- '%c'\n"
msgstr "%s : option invalide -- %c\n"
#: posix/getopt.c:868 posix/getopt.c:884 posix/getopt.c:1088
#: posix/getopt.c:1106
#, c-format
-msgid "%s: option requires an argument -- %c\n"
+msgid "%s: option requires an argument -- '%c'\n"
msgstr "%s : l'option requiert un argument -- %c\n"
#: posix/getopt.c:937 posix/getopt.c:953
#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+msgid "%s: option '-W %s' is ambiguous\n"
msgstr "%s : l'option « -W %s » est ambiguë\n"
#: posix/getopt.c:977 posix/getopt.c:995
#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgid "%s: option '-W %s' doesn't allow an argument\n"
msgstr "%s : l'option « -W %s » ne permet pas d'argument\n"
#: posix/regcomp.c:135
Modified: fsf/trunk/libc/po/hr.po
==============================================================================
--- fsf/trunk/libc/po/hr.po (original)
+++ fsf/trunk/libc/po/hr.po Sun Mar 9 00:04:00 2008
@@ -599,7 +599,7 @@
#: posix/getopt.c:887 posix/getopt.c:890
#, c-format
-msgid "%s: illegal option -- %c\n"
+msgid "%s: illegal option -- '%c'\n"
msgstr "%s: nedozvoljena opcija -- %c\n"
#: locale/programs/ld-address.c:578 locale/programs/ld-collate.c:3738 locale/programs/ld-ctype.c:2846 locale/programs/ld-identification.c:445 locale/programs/ld-measurement.c:234 locale/programs/ld-messages.c:329 locale/programs/ld-monetary.c:934 locale/programs/ld-name.c:303 locale/programs/ld-numeric.c:373 locale/programs/ld-paper.c:236 locale/programs/ld-telephone.c:311 locale/programs/ld-time.c:1197
@@ -629,7 +629,7 @@
#: posix/getopt.c:896 posix/getopt.c:899
#, c-format
-msgid "%s: invalid option -- %c\n"
+msgid "%s: invalid option -- '%c'\n"
msgstr "%s: nedozvoljena opcija -- %c\n"
#: locale/programs/ld-time.c:330
@@ -754,37 +754,37 @@
#: posix/getopt.c:743 posix/getopt.c:748
#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgid "%s: option '%c%s' doesn't allow an argument\n"
msgstr "%s: opcija `%c%s' ne dopušta argument\n"
#: posix/getopt.c:688 posix/getopt.c:698
#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s' is ambiguous\n"
msgstr "%s: opcija `%s' je nejednoznaÄna\n"
#: posix/getopt.c:782 posix/getopt.c:793 posix/getopt.c:1070 posix/getopt.c:1082
#, c-format
-msgid "%s: option `%s' requires an argument\n"
+msgid "%s: option '%s' requires an argument\n"
msgstr "%s: opcija `%s' zahtijeva argument\n"
#: posix/getopt.c:730 posix/getopt.c:734
#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+msgid "%s: option '--%s' doesn't allow an argument\n"
msgstr "%s: opcija `--%s' ne dopušta argument\n"
#: posix/getopt.c:1038 posix/getopt.c:1049
#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgid "%s: option '-W %s' doesn't allow an argument\n"
msgstr "%s: opcija `-W %s' ne dopušta argument\n"
#: posix/getopt.c:1004 posix/getopt.c:1014
#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+msgid "%s: option '-W %s' is ambiguous\n"
msgstr "%s: opcija `-W %s' je nejednoznaÄna\n"
#: posix/getopt.c:942 posix/getopt.c:952 posix/getopt.c:1136 posix/getopt.c:1147
#, c-format
-msgid "%s: option requires an argument -- %c\n"
+msgid "%s: option requires an argument -- '%c'\n"
msgstr "%s: opcija zahtijeva argument -- %c\n"
#: locale/programs/ld-collate.c:1327 locale/programs/ld-collate.c:3675
@@ -949,12 +949,12 @@
#: posix/getopt.c:841 posix/getopt.c:844
#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+msgid "%s: unrecognized option '%c%s'\n"
msgstr "%s: neprepoznata opcija `%c%s'\n"
#: posix/getopt.c:830 posix/getopt.c:833
#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+msgid "%s: unrecognized option '--%s'\n"
msgstr "%s: neprepoznata opcija `--%s'\n"
#: timezone/zic.c:449
Modified: fsf/trunk/libc/po/ko.po
==============================================================================
--- fsf/trunk/libc/po/ko.po (original)
+++ fsf/trunk/libc/po/ko.po Sun Mar 9 00:04:00 2008
@@ -4330,59 +4330,59 @@
#: posix/getopt.c:571 posix/getopt.c:587
#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s' is ambiguous\n"
msgstr "%s: `%s' ì˜µì…˜ì€ ëª¨í˜¸í•œ 옵션입니다\n"
#: posix/getopt.c:620 posix/getopt.c:624
#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+msgid "%s: option '--%s' doesn't allow an argument\n"
msgstr "%s: `--%s' ì˜µì…˜ì€ ì¸ìˆ˜ë¥¼ 허용하지 않습니다\n"
#: posix/getopt.c:633 posix/getopt.c:638
#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgid "%s: option '%c%s' doesn't allow an argument\n"
msgstr "%s: `%c%s' ì˜µì…˜ì€ ì¸ìˆ˜ë¥¼ 허용하지 않습니다\n"
#: posix/getopt.c:681 posix/getopt.c:700 posix/getopt.c:1016
#: posix/getopt.c:1035
#, c-format
-msgid "%s: option `%s' requires an argument\n"
+msgid "%s: option '%s' requires an argument\n"
msgstr "%s: `%s' ì˜µì…˜ì€ ì¸ìˆ˜ê°€ 필요합니다\n"
#: posix/getopt.c:738 posix/getopt.c:741
#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+msgid "%s: unrecognized option '--%s'\n"
msgstr "%s: ì¸ì‹í• 수 없는 옵션 `--%s'\n"
#: posix/getopt.c:749 posix/getopt.c:752
#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+msgid "%s: unrecognized option '%c%s'\n"
msgstr "%s: ì¸ì‹í• 수 없는 옵션 `%c%s'\n"
#: posix/getopt.c:804 posix/getopt.c:807
#, c-format
-msgid "%s: illegal option -- %c\n"
+msgid "%s: illegal option -- '%c'\n"
msgstr "%s: ìž˜ëª»ëœ ì˜µì…˜ -- %c\n"
#: posix/getopt.c:813 posix/getopt.c:816
#, c-format
-msgid "%s: invalid option -- %c\n"
+msgid "%s: invalid option -- '%c'\n"
msgstr "%s: 부ì ì ˆí•œ 옵션 -- %c\n"
#: posix/getopt.c:868 posix/getopt.c:884 posix/getopt.c:1088
#: posix/getopt.c:1106
#, c-format
-msgid "%s: option requires an argument -- %c\n"
+msgid "%s: option requires an argument -- '%c'\n"
msgstr "%s: ì´ ì˜µì…˜ì€ ì¸ìˆ˜ê°€ 필요합니다 -- %c\n"
#: posix/getopt.c:937 posix/getopt.c:953
#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+msgid "%s: option '-W %s' is ambiguous\n"
msgstr "%s: `-W %s' ì˜µì…˜ì€ ëª¨í˜¸í•œ 옵션입니다\n"
#: posix/getopt.c:977 posix/getopt.c:995
#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgid "%s: option '-W %s' doesn't allow an argument\n"
msgstr "%s: `-W %s' ì˜µì…˜ì€ ì¸ìˆ˜ë¥¼ 허용하지 않습니다\n"
#: posix/regcomp.c:135
Modified: fsf/trunk/libc/po/nl.po
==============================================================================
--- fsf/trunk/libc/po/nl.po (original)
+++ fsf/trunk/libc/po/nl.po Sun Mar 9 00:04:00 2008
@@ -4356,59 +4356,59 @@
#: posix/getopt.c:571 posix/getopt.c:587
#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s' is ambiguous\n"
msgstr "%s: optie '%s' is niet eenduidig\n"
#: posix/getopt.c:620 posix/getopt.c:624
#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+msgid "%s: option '--%s' doesn't allow an argument\n"
msgstr "%s: optie '--%s' staat geen argument toe\n"
#: posix/getopt.c:633 posix/getopt.c:638
#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgid "%s: option '%c%s' doesn't allow an argument\n"
msgstr "%s: optie '%c%s' staat geen argument toe\n"
#: posix/getopt.c:681 posix/getopt.c:700 posix/getopt.c:1016
#: posix/getopt.c:1035
#, c-format
-msgid "%s: option `%s' requires an argument\n"
+msgid "%s: option '%s' requires an argument\n"
msgstr "%s: optie '%s' vereist een argument\n"
#: posix/getopt.c:738 posix/getopt.c:741
#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+msgid "%s: unrecognized option '--%s'\n"
msgstr "%s: onbekende optie '--%s'\n"
#: posix/getopt.c:749 posix/getopt.c:752
#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+msgid "%s: unrecognized option '%c%s'\n"
msgstr "%s: onbekende optie '%c%s'\n"
#: posix/getopt.c:804 posix/getopt.c:807
#, c-format
-msgid "%s: illegal option -- %c\n"
+msgid "%s: illegal option -- '%c'\n"
msgstr "%s: ongeldige optie -- %c\n"
#: posix/getopt.c:813 posix/getopt.c:816
#, c-format
-msgid "%s: invalid option -- %c\n"
+msgid "%s: invalid option -- '%c'\n"
msgstr "%s: ongeldige optie -- %c\n"
#: posix/getopt.c:868 posix/getopt.c:884 posix/getopt.c:1088
#: posix/getopt.c:1106
#, c-format
-msgid "%s: option requires an argument -- %c\n"
+msgid "%s: option requires an argument -- '%c'\n"
msgstr "%s: optie vereist een argument -- %c\n"
#: posix/getopt.c:937 posix/getopt.c:953
#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+msgid "%s: option '-W %s' is ambiguous\n"
msgstr "%s: optie '-W %s' is niet eenduidig\n"
#: posix/getopt.c:977 posix/getopt.c:995
#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgid "%s: option '-W %s' doesn't allow an argument\n"
msgstr "%s: optie '-W %s' staat geen argument toe\n"
#: posix/regcomp.c:135
Modified: fsf/trunk/libc/po/rw.po
==============================================================================
--- fsf/trunk/libc/po/rw.po (original)
+++ fsf/trunk/libc/po/rw.po Sun Mar 9 00:04:00 2008
@@ -3941,59 +3941,59 @@
#: posix/getopt.c:692 posix/getopt.c:711
#, fuzzy, c-format
-msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s' is ambiguous\n"
msgstr "%s:Ihitamo ni"
#: posix/getopt.c:744 posix/getopt.c:748
#, fuzzy, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+msgid "%s: option '--%s' doesn't allow an argument\n"
msgstr "%s:Ihitamo Kwemerera"
#: posix/getopt.c:757 posix/getopt.c:762
#, fuzzy, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgid "%s: option '%c%s' doesn't allow an argument\n"
msgstr "%s:Ihitamo Kwemerera"
#: posix/getopt.c:807 posix/getopt.c:829 posix/getopt.c:1159
#: posix/getopt.c:1181
#, fuzzy, c-format
-msgid "%s: option `%s' requires an argument\n"
+msgid "%s: option '%s' requires an argument\n"
msgstr "%s:Ihitamo"
#: posix/getopt.c:867 posix/getopt.c:870
#, fuzzy, c-format
-msgid "%s: unrecognized option `--%s'\n"
+msgid "%s: unrecognized option '--%s'\n"
msgstr "%s:Ihitamo"
#: posix/getopt.c:878 posix/getopt.c:881
#, fuzzy, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+msgid "%s: unrecognized option '%c%s'\n"
msgstr "%s:Ihitamo"
#: posix/getopt.c:936 posix/getopt.c:939
#, fuzzy, c-format
-msgid "%s: illegal option -- %c\n"
+msgid "%s: illegal option -- '%c'\n"
msgstr "%s:Ihitamo"
#: posix/getopt.c:945 posix/getopt.c:948
#, fuzzy, c-format
-msgid "%s: invalid option -- %c\n"
+msgid "%s: invalid option -- '%c'\n"
msgstr "%s:Sibyo Ihitamo"
#: posix/getopt.c:1003 posix/getopt.c:1022 posix/getopt.c:1234
#: posix/getopt.c:1255
#, fuzzy, c-format
-msgid "%s: option requires an argument -- %c\n"
+msgid "%s: option requires an argument -- '%c'\n"
msgstr "%s:Ihitamo"
#: posix/getopt.c:1074 posix/getopt.c:1093
#, fuzzy, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+msgid "%s: option '-W %s' is ambiguous\n"
msgstr "%s:Ihitamo ni"
#: posix/getopt.c:1117 posix/getopt.c:1138
#, fuzzy, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgid "%s: option '-W %s' doesn't allow an argument\n"
msgstr "%s:Ihitamo Kwemerera"
#: posix/regcomp.c:150
Modified: fsf/trunk/libc/po/sk.po
==============================================================================
--- fsf/trunk/libc/po/sk.po (original)
+++ fsf/trunk/libc/po/sk.po Sun Mar 9 00:04:00 2008
@@ -3512,59 +3512,59 @@
#: posix/getopt.c:692 posix/getopt.c:711
#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s' is ambiguous\n"
msgstr "%s: voľba `%s' nie je jednoznaÄná\n"
#: posix/getopt.c:744 posix/getopt.c:748
#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+msgid "%s: option '--%s' doesn't allow an argument\n"
msgstr "%s: voľba `--%s' nedovoľuje použiť argument\n"
#: posix/getopt.c:757 posix/getopt.c:762
#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgid "%s: option '%c%s' doesn't allow an argument\n"
msgstr "%s: voľba `%c%s' nedovoľuje použiť argument\n"
#: posix/getopt.c:807 posix/getopt.c:829 posix/getopt.c:1159
#: posix/getopt.c:1181
#, c-format
-msgid "%s: option `%s' requires an argument\n"
+msgid "%s: option '%s' requires an argument\n"
msgstr "%s: voľba `%s' vyžaduje argument\n"
#: posix/getopt.c:867 posix/getopt.c:870
#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+msgid "%s: unrecognized option '--%s'\n"
msgstr "%s: nerozpoznaná voľba `--%s'\n"
#: posix/getopt.c:878 posix/getopt.c:881
#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+msgid "%s: unrecognized option '%c%s'\n"
msgstr "%s: nerozpoznaná voľba `%c%s'\n"
#: posix/getopt.c:936 posix/getopt.c:939
#, c-format
-msgid "%s: illegal option -- %c\n"
+msgid "%s: illegal option -- '%c'\n"
msgstr "%s: neprÃpustná voľba -- %c\n"
#: posix/getopt.c:945 posix/getopt.c:948
#, c-format
-msgid "%s: invalid option -- %c\n"
+msgid "%s: invalid option -- '%c'\n"
msgstr "%s: chybná voľba -- %c\n"
#: posix/getopt.c:1003 posix/getopt.c:1022 posix/getopt.c:1234
#: posix/getopt.c:1255
#, c-format
-msgid "%s: option requires an argument -- %c\n"
+msgid "%s: option requires an argument -- '%c'\n"
msgstr "%s: voľba vyžaduje argument -- %c\n"
#: posix/getopt.c:1074 posix/getopt.c:1093
#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+msgid "%s: option '-W %s' is ambiguous\n"
msgstr "%s: voľba `-W %s' nie je jednoznaÄná\n"
#: posix/getopt.c:1117 posix/getopt.c:1138
#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgid "%s: option '-W %s' doesn't allow an argument\n"
msgstr "%s: voľba `-W %s' nedovoľuje pouťiť argument\n"
#: posix/regcomp.c:150
Modified: fsf/trunk/libc/po/sv.po
==============================================================================
--- fsf/trunk/libc/po/sv.po (original)
+++ fsf/trunk/libc/po/sv.po Sun Mar 9 00:04:00 2008
@@ -4328,59 +4328,59 @@
#: posix/getopt.c:571 posix/getopt.c:587
#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s' is ambiguous\n"
msgstr "%s: flaggan \"%s\" är tvetydig\n"
#: posix/getopt.c:620 posix/getopt.c:624
#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+msgid "%s: option '--%s' doesn't allow an argument\n"
msgstr "%s: flaggan \"--%s\" tar inget argument\n"
#: posix/getopt.c:633 posix/getopt.c:638
#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgid "%s: option '%c%s' doesn't allow an argument\n"
msgstr "%s: flaggan \"%c%s\" tar inget argument\n"
#: posix/getopt.c:681 posix/getopt.c:700 posix/getopt.c:1016
#: posix/getopt.c:1035
#, c-format
-msgid "%s: option `%s' requires an argument\n"
+msgid "%s: option '%s' requires an argument\n"
msgstr "%s: flaggan \"%s\" behöver ett argument\n"
#: posix/getopt.c:738 posix/getopt.c:741
#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+msgid "%s: unrecognized option '--%s'\n"
msgstr "%s: okänd flagga \"--%s\"\n"
#: posix/getopt.c:749 posix/getopt.c:752
#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+msgid "%s: unrecognized option '%c%s'\n"
msgstr "%s: okänd flagga \"%c%s\"\n"
#: posix/getopt.c:804 posix/getopt.c:807
#, c-format
-msgid "%s: illegal option -- %c\n"
+msgid "%s: illegal option -- '%c'\n"
msgstr "%s: otillåten flagga -- %c\n"
#: posix/getopt.c:813 posix/getopt.c:816
#, c-format
-msgid "%s: invalid option -- %c\n"
+msgid "%s: invalid option -- '%c'\n"
msgstr "%s: ogiltig flagga -- %c\n"
#: posix/getopt.c:868 posix/getopt.c:884 posix/getopt.c:1088
#: posix/getopt.c:1106
#, c-format
-msgid "%s: option requires an argument -- %c\n"
+msgid "%s: option requires an argument -- '%c'\n"
msgstr "%s: flaggan behöver ett argument -- %c\n"
#: posix/getopt.c:937 posix/getopt.c:953
#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+msgid "%s: option '-W %s' is ambiguous\n"
msgstr "%s: flaggan \"-W %s\" är tvetydig\n"
#: posix/getopt.c:977 posix/getopt.c:995
#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgid "%s: option '-W %s' doesn't allow an argument\n"
msgstr "%s: flaggan \"-W %s\" tar inget argument\n"
#: posix/regcomp.c:135
Modified: fsf/trunk/libc/po/tr.po
==============================================================================
--- fsf/trunk/libc/po/tr.po (original)
+++ fsf/trunk/libc/po/tr.po Sun Mar 9 00:04:00 2008
@@ -4330,59 +4330,59 @@
#: posix/getopt.c:571 posix/getopt.c:587
#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s' is ambiguous\n"
msgstr "%s: `%s' seçeneği burada belirsiz\n"
#: posix/getopt.c:620 posix/getopt.c:624
#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+msgid "%s: option '--%s' doesn't allow an argument\n"
msgstr "%s: `--%s' seçeneği argümansız kullanılır\n"
#: posix/getopt.c:633 posix/getopt.c:638
#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgid "%s: option '%c%s' doesn't allow an argument\n"
msgstr "%s: `%c%s' seçeneği argümansız kullanılır\n"
#: posix/getopt.c:681 posix/getopt.c:700 posix/getopt.c:1016
#: posix/getopt.c:1035
#, c-format
-msgid "%s: option `%s' requires an argument\n"
+msgid "%s: option '%s' requires an argument\n"
msgstr "%s: `%s' seçeneği bir argümanla kullanılır\n"
#: posix/getopt.c:738 posix/getopt.c:741
#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+msgid "%s: unrecognized option '--%s'\n"
msgstr "%s: tanınmayan seçenek `--%s'\n"
#: posix/getopt.c:749 posix/getopt.c:752
#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+msgid "%s: unrecognized option '%c%s'\n"
msgstr "%s: tanınmayan seçenek: `%c%s'\n"
#: posix/getopt.c:804 posix/getopt.c:807
#, c-format
-msgid "%s: illegal option -- %c\n"
+msgid "%s: illegal option -- '%c'\n"
msgstr "%s: kuraldışı seçenek -- %c\n"
#: posix/getopt.c:813 posix/getopt.c:816
#, c-format
-msgid "%s: invalid option -- %c\n"
+msgid "%s: invalid option -- '%c'\n"
msgstr "%s: geçersiz seçenek -- %c\n"
#: posix/getopt.c:868 posix/getopt.c:884 posix/getopt.c:1088
#: posix/getopt.c:1106
#, c-format
-msgid "%s: option requires an argument -- %c\n"
+msgid "%s: option requires an argument -- '%c'\n"
msgstr "%s: seçenek bir argümanla kullanılır -- %c\n"
#: posix/getopt.c:937 posix/getopt.c:953
#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+msgid "%s: option '-W %s' is ambiguous\n"
msgstr "%s: `-W %s' seçeneği burada belirsiz\n"
#: posix/getopt.c:977 posix/getopt.c:995
#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgid "%s: option '-W %s' doesn't allow an argument\n"
msgstr "%s: `-W %s' seçeneği argümansız kullanılır\n"
#: posix/regcomp.c:135
Modified: fsf/trunk/libc/po/zh_CN.po
==============================================================================
--- fsf/trunk/libc/po/zh_CN.po (original)
+++ fsf/trunk/libc/po/zh_CN.po Sun Mar 9 00:04:00 2008
@@ -4195,59 +4195,59 @@
#: posix/getopt.c:571 posix/getopt.c:587
#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s' is ambiguous\n"
msgstr "%s：选项“%sâ€å…·æœ‰äºŒä¹‰æ€§\n"
#: posix/getopt.c:620 posix/getopt.c:624
#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+msgid "%s: option '--%s' doesn't allow an argument\n"
msgstr "%s：选项“--%sâ€ä¸æŽ¥å—任何å‚æ•°\n"
#: posix/getopt.c:633 posix/getopt.c:638
#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgid "%s: option '%c%s' doesn't allow an argument\n"
msgstr "%s：选项“%c%sâ€ä¸æŽ¥å—å‚æ•°\n"
#: posix/getopt.c:681 posix/getopt.c:700 posix/getopt.c:1016
#: posix/getopt.c:1035
#, c-format
-msgid "%s: option `%s' requires an argument\n"
+msgid "%s: option '%s' requires an argument\n"
msgstr "%s：选项“%sâ€éœ€è¦ä¸€ä¸ªå‚æ•°\n"
#: posix/getopt.c:738 posix/getopt.c:741
#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+msgid "%s: unrecognized option '--%s'\n"
msgstr "%sï¼šæ— æ³•è¯†åˆ«çš„é€‰é¡¹â€œ--%sâ€\n"
#: posix/getopt.c:749 posix/getopt.c:752
#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+msgid "%s: unrecognized option '%c%s'\n"
msgstr "%sï¼šæ— æ³•è¯†åˆ«çš„é€‰é¡¹â€œ%c%sâ€\n"
#: posix/getopt.c:804 posix/getopt.c:807
#, c-format
-msgid "%s: illegal option -- %c\n"
+msgid "%s: illegal option -- '%c'\n"
msgstr "%sï¼šæ— æ•ˆé€‰é¡¹ -- %c\n"
#: posix/getopt.c:813 posix/getopt.c:816
#, c-format
-msgid "%s: invalid option -- %c\n"
+msgid "%s: invalid option -- '%c'\n"
msgstr "%sï¼šæ— æ•ˆé€‰é¡¹ -- %c\n"
#: posix/getopt.c:868 posix/getopt.c:884 posix/getopt.c:1088
#: posix/getopt.c:1106
#, c-format
-msgid "%s: option requires an argument -- %c\n"
+msgid "%s: option requires an argument -- '%c'\n"
msgstr "%s：选项需è¦ä¸€ä¸ªå‚æ•° -- %c\n"
#: posix/getopt.c:937 posix/getopt.c:953
#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+msgid "%s: option '-W %s' is ambiguous\n"
msgstr "%s：选项“-W %sâ€å…·æœ‰äºŒä¹‰æ€§\n"
#: posix/getopt.c:977 posix/getopt.c:995
#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgid "%s: option '-W %s' doesn't allow an argument\n"
msgstr "%s：选项“-W %sâ€ä¸æŽ¥å—å‚æ•°\n"
#: posix/regcomp.c:135
Modified: fsf/trunk/libc/po/zh_TW.po
==============================================================================
--- fsf/trunk/libc/po/zh_TW.po (original)
+++ fsf/trunk/libc/po/zh_TW.po Sun Mar 9 00:04:00 2008
@@ -3545,59 +3545,59 @@
#: posix/getopt.c:692 posix/getopt.c:711
#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s' is ambiguous\n"
msgstr "%s: é¸é … `%s' å«ç¾©ä¸æ¸…\n"
#: posix/getopt.c:744 posix/getopt.c:748
#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+msgid "%s: option '--%s' doesn't allow an argument\n"
msgstr "%s: é¸é … `--%s' ä¸å…è¨±é™„åŠ å¼•æ•¸\n"
#: posix/getopt.c:757 posix/getopt.c:762
#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgid "%s: option '%c%s' doesn't allow an argument\n"
msgstr "%s: é¸é … `%c%s' ä¸å…è¨±é™„åŠ å¼•æ•¸\n"
#: posix/getopt.c:807 posix/getopt.c:829 posix/getopt.c:1159
#: posix/getopt.c:1181
#, c-format
-msgid "%s: option `%s' requires an argument\n"
+msgid "%s: option '%s' requires an argument\n"
msgstr "%s: é¸é … `%s' 需è¦ä¸€å€‹å¼•æ•¸\n"
#: posix/getopt.c:867 posix/getopt.c:870
#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+msgid "%s: unrecognized option '--%s'\n"
msgstr "%s: 未知的é¸é … `--%s'\n"
#: posix/getopt.c:878 posix/getopt.c:881
#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+msgid "%s: unrecognized option '%c%s'\n"
msgstr "%s: 未知的é¸é … `%c%s'\n"
#: posix/getopt.c:936 posix/getopt.c:939
#, c-format
-msgid "%s: illegal option -- %c\n"
+msgid "%s: illegal option -- '%c'\n"
msgstr "%s: ä¸åˆæ³•çš„é¸é … -- %c\n"
#: posix/getopt.c:945 posix/getopt.c:948
#, c-format
-msgid "%s: invalid option -- %c\n"
+msgid "%s: invalid option -- '%c'\n"
msgstr "%s: ä¸é©ç”¨çš„é¸é … -- %c\n"
#: posix/getopt.c:1003 posix/getopt.c:1022 posix/getopt.c:1234
#: posix/getopt.c:1255
#, c-format
-msgid "%s: option requires an argument -- %c\n"
+msgid "%s: option requires an argument -- '%c'\n"
msgstr "%s: é¸é …需è¦ä¸€å€‹å¼•æ•¸ -- %c\n"
#: posix/getopt.c:1074 posix/getopt.c:1093
#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+msgid "%s: option '-W %s' is ambiguous\n"
msgstr "%s: é¸é … `-W %s' å«ç¾©ä¸æ¸…\n"
#: posix/getopt.c:1117 posix/getopt.c:1138
#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgid "%s: option '-W %s' doesn't allow an argument\n"
msgstr "%s: é¸é … `-W %s' ä¸å…è¨±é™„åŠ å¼•æ•¸\n"
#: posix/regcomp.c:150
Modified: fsf/trunk/libc/posix/getopt.c
==============================================================================
--- fsf/trunk/libc/posix/getopt.c (original)
+++ fsf/trunk/libc/posix/getopt.c Sun Mar 9 00:04:00 2008
@@ -1,9 +1,8 @@
/* Getopt for GNU.
- NOTE: getopt is now 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@xxxxxxx
before changing it!
- Copyright (C) 1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001,2002,2003,2004
- Free Software Foundation, Inc.
+ Copyright (C) 1987-1996,1998-2004,2008 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
@@ -568,7 +567,7 @@
#if defined _LIBC && defined USE_IN_LIBIO
char *buf;
- if (__asprintf (&buf, _("%s: option `%s' is ambiguous\n"),
+ if (__asprintf (&buf, _("%s: option '%s' is ambiguous\n"),
argv[0], argv[d->optind]) >= 0)
{
_IO_flockfile (stderr);
@@ -584,7 +583,7 @@
free (buf);
}
#else
- fprintf (stderr, _("%s: option `%s' is ambiguous\n"),
+ fprintf (stderr, _("%s: option '%s' is ambiguous\n"),
argv[0], argv[d->optind]);
#endif
}
@@ -618,11 +617,11 @@
/* --option */
#if defined _LIBC && defined USE_IN_LIBIO
n = __asprintf (&buf, _("\
-%s: option `--%s' doesn't allow an argument\n"),
+%s: option '--%s' doesn't allow an argument\n"),
argv[0], pfound->name);
#else
fprintf (stderr, _("\
-%s: option `--%s' doesn't allow an argument\n"),
+%s: option '--%s' doesn't allow an argument\n"),
argv[0], pfound->name);
#endif
}
@@ -631,12 +630,12 @@
/* +option or -option */
#if defined _LIBC && defined USE_IN_LIBIO
n = __asprintf (&buf, _("\
-%s: option `%c%s' doesn't allow an argument\n"),
+%s: option '%c%s' doesn't allow an argument\n"),
argv[0], argv[d->optind - 1][0],
pfound->name);
#else
fprintf (stderr, _("\
-%s: option `%c%s' doesn't allow an argument\n"),
+%s: option '%c%s' doesn't allow an argument\n"),
argv[0], argv[d->optind - 1][0],
pfound->name);
#endif
@@ -679,7 +678,7 @@
char *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)
{
_IO_flockfile (stderr);
@@ -697,7 +696,7 @@
}
#else
fprintf (stderr,
- _("%s: option `%s' requires an argument\n"),
+ _("%s: option '%s' requires an argument\n"),
argv[0], argv[d->optind - 1]);
#endif
}
@@ -735,10 +734,10 @@
{
/* --option */
#if defined _LIBC && defined USE_IN_LIBIO
- n = __asprintf (&buf, _("%s: unrecognized option `--%s'\n"),
+ n = __asprintf (&buf, _("%s: unrecognized option '--%s'\n"),
argv[0], d->__nextchar);
#else
- fprintf (stderr, _("%s: unrecognized option `--%s'\n"),
+ fprintf (stderr, _("%s: unrecognized option '--%s'\n"),
argv[0], d->__nextchar);
#endif
}
@@ -746,10 +745,10 @@
{
/* +option or -option */
#if defined _LIBC && defined USE_IN_LIBIO
- n = __asprintf (&buf, _("%s: unrecognized option `%c%s'\n"),
+ n = __asprintf (&buf, _("%s: unrecognized option '%c%s'\n"),
argv[0], argv[d->optind][0], d->__nextchar);
#else
- fprintf (stderr, _("%s: unrecognized option `%c%s'\n"),
+ fprintf (stderr, _("%s: unrecognized option '%c%s'\n"),
argv[0], argv[d->optind][0], d->__nextchar);
#endif
}
@@ -799,21 +798,22 @@
if (d->__posixly_correct)
{
- /* 1003.2 specifies the format of this message. */
-#if defined _LIBC && defined USE_IN_LIBIO
- n = __asprintf (&buf, _("%s: illegal option -- %c\n"),
+#if defined _LIBC && defined USE_IN_LIBIO
+ n = __asprintf (&buf, _("%s: illegal option -- '%c'\n"),
argv[0], c);
#else
- fprintf (stderr, _("%s: illegal option -- %c\n"), argv[0], c);
+ fprintf (stderr, _("%s: illegal option -- '%c'\n"), argv[0],
+ c);
#endif
}
else
{
#if defined _LIBC && defined USE_IN_LIBIO
- n = __asprintf (&buf, _("%s: invalid option -- %c\n"),
+ n = __asprintf (&buf, _("%s: invalid option -- '%c'\n"),
argv[0], c);
#else
- fprintf (stderr, _("%s: invalid option -- %c\n"), argv[0], c);
+ fprintf (stderr, _("%s: invalid option -- '%c'\n"), argv[0],
+ c);
#endif
}
@@ -860,12 +860,11 @@
{
if (print_errors)
{
- /* 1003.2 specifies the format of this message. */
#if defined _LIBC && defined USE_IN_LIBIO
char *buf;
if (__asprintf (&buf,
- _("%s: option requires an argument -- %c\n"),
+ _("%s: option requires an argument -- '%c'\n"),
argv[0], c) >= 0)
{
_IO_flockfile (stderr);
@@ -881,7 +880,8 @@
free (buf);
}
#else
- fprintf (stderr, _("%s: option requires an argument -- %c\n"),
+ fprintf (stderr,
+ _("%s: option requires an argument -- '%c'\n"),
argv[0], c);
#endif
}
@@ -934,7 +934,7 @@
#if defined _LIBC && defined USE_IN_LIBIO
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)
{
_IO_flockfile (stderr);
@@ -950,7 +950,7 @@
free (buf);
}
#else
- fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"),
+ fprintf (stderr, _("%s: option '-W %s' is ambiguous\n"),
argv[0], argv[d->optind]);
#endif
}
@@ -975,7 +975,7 @@
char *buf;
if (__asprintf (&buf, _("\
-%s: option `-W %s' doesn't allow an argument\n"),
+%s: option '-W %s' doesn't allow an argument\n"),
argv[0], pfound->name) >= 0)
{
_IO_flockfile (stderr);
@@ -993,7 +993,7 @@
}
#else
fprintf (stderr, _("\
-%s: option `-W %s' doesn't allow an argument\n"),
+%s: option '-W %s' doesn't allow an argument\n"),
argv[0], pfound->name);
#endif
}
@@ -1014,7 +1014,7 @@
char *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)
{
_IO_flockfile (stderr);
@@ -1032,7 +1032,7 @@
}
#else
fprintf (stderr,
- _("%s: option `%s' requires an argument\n"),
+ _("%s: option '%s' requires an argument\n"),
argv[0], argv[d->optind - 1]);
#endif
}
@@ -1081,12 +1081,11 @@
{
if (print_errors)
{
- /* 1003.2 specifies the format of this message. */
#if defined _LIBC && defined USE_IN_LIBIO
char *buf;
if (__asprintf (&buf, _("\
-%s: option requires an argument -- %c\n"),
+%s: option requires an argument -- '%c'\n"),
argv[0], c) >= 0)
{
_IO_flockfile (stderr);
@@ -1103,7 +1102,7 @@
}
#else
fprintf (stderr,
- _("%s: option requires an argument -- %c\n"),
+ _("%s: option requires an argument -- '%c'\n"),
argv[0], c);
#endif
}
@@ -1200,7 +1199,7 @@
break;
case 'c':
- printf ("option c with value `%s'\n", optarg);
+ printf ("option c with value '%s'\n", optarg);
break;
case '?':
Modified: fsf/trunk/libc/stdlib/Makefile
==============================================================================
--- fsf/trunk/libc/stdlib/Makefile (original)
+++ fsf/trunk/libc/stdlib/Makefile Sun Mar 9 00:04:00 2008
@@ -69,7 +69,7 @@
test-a64l tst-qsort tst-system testmb2 bug-strtod2 \
tst-atof1 tst-atof2 tst-strtod2 tst-strtod3 tst-rand48-2 \
tst-makecontext tst-strtod4 tst-strtod5 tst-qsort2 \
- tst-makecontext2
+ tst-makecontext2 tst-strtod6
include ../Makeconfig
Modified: fsf/trunk/libc/stdlib/strtod_l.c
==============================================================================
--- fsf/trunk/libc/stdlib/strtod_l.c (original)
+++ fsf/trunk/libc/stdlib/strtod_l.c Sun Mar 9 00:04:00 2008
@@ -594,6 +594,9 @@
mant = STRTOULL (startp + 1, &endp, 0);
if (endp == cp)
SET_MANTISSA (retval, mant);
+
+ /* Consume the closing brace. */
+ ++cp;
}
}
Added: fsf/trunk/libc/stdlib/tst-strtod6.c
==============================================================================
--- fsf/trunk/libc/stdlib/tst-strtod6.c (added)
+++ fsf/trunk/libc/stdlib/tst-strtod6.c Sun Mar 9 00:04:00 2008
@@ -1,0 +1,53 @@
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static int
+do_test (void)
+{
+ static const char str[] = "NaN(blabla)something";
+ char *endp;
+ int result = 0;
+
+ double d = strtod (str, &endp);
+ if (!isnan (d))
+ {
+ puts ("strtod did not return NAN");
+ result = 1;
+ }
+ if (strcmp (endp, "something") != 0)
+ {
+ puts ("strtod set incorrect end pointer");
+ result = 1;
+ }
+
+ float f = strtof (str, &endp);
+ if (!isnanf (f))
+ {
+ puts ("strtof did not return NAN");
+ result = 1;
+ }
+ if (strcmp (endp, "something") != 0)
+ {
+ puts ("strtof set incorrect end pointer");
+ result = 1;
+ }
+
+ long double ld = strtold (str, &endp);
+ if (!isnan (ld))
+ {
+ puts ("strtold did not return NAN");
+ result = 1;
+ }
+ if (strcmp (endp, "something") != 0)
+ {
+ puts ("strtold set incorrect end pointer");
+ result = 1;
+ }
+
+ return result;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
Modified: fsf/trunk/libc/sysdeps/mach/hurd/i386/trampoline.c
==============================================================================
--- fsf/trunk/libc/sysdeps/mach/hurd/i386/trampoline.c (original)
+++ fsf/trunk/libc/sysdeps/mach/hurd/i386/trampoline.c Sun Mar 9 00:04:00 2008
@@ -1,5 +1,5 @@
/* Set thread_state for sighandler, and sigcontext to recover. i386 version.
- Copyright (C) 1994,1995,1996,1997,1998,1999,2005
+ Copyright (C) 1994,1995,1996,1997,1998,1999,2005,2008
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -21,6 +21,7 @@
#include <hurd/signal.h>
#include <hurd/userlink.h>
#include <thread_state.h>
+#include <mach/machine/eflags.h>
#include <assert.h>
#include <errno.h>
#include "hurdfault.h"
@@ -218,6 +219,9 @@
/* We pass the handler function to the trampoline code in %edx. */
state->basic.edx = (int) handler;
+ /* The x86 ABI says the DF bit is clear on entry to any function. */
+ state->basic.efl &= ~EFL_DF;
+
return scp;
}
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/dl-sysdep.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/dl-sysdep.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/dl-sysdep.c Sun Mar 9 00:04:00 2008
@@ -27,7 +27,8 @@
#include <ldsodefs.h>
#include <kernel-features.h>
-#define DL_SYSDEP_INIT frob_brk ()
+#ifdef SHARED
+# define DL_SYSDEP_INIT frob_brk ()
static inline void
frob_brk (void)
@@ -56,7 +57,8 @@
#endif
}
-#include <elf/dl-sysdep.c>
+# include <elf/dl-sysdep.c>
+#endif
int