Eric Blake wrote:
merge 11470 11472
thanks
On 05/14/2012 01:27 PM, Petr Pisar wrote:
The problem is such string does not pass through msgfmt tool while compiling
the catalog because the '% ' is not a valid printf sequence.
Solution is to suppress the auto-detection by adding /*xgettext:no-c-format*/
before the fputs() line in the source code.
Thanks. You're the third person to report this today, but the first to
provide a potential patch. Are you comfortable submitting that fix in
'git format-patch' form with a proper commit message? If not, we will
probably do it on your behalf in the next 24 hours or so.
Thanks for all the replies and for merging those, Eric.
I wrote the patch. As expected, it was more work to collect and
insert names in THANKS.in than to make the actual change ;-)
Note that Göran's name is already in the generated THANKS file,
so I didn't add it below.
If anyone listed prefers a different spelling of name or email,
just let us know.
From 54be50197b47ba9200a1c3e48847fa959d4f5bfd Mon Sep 17 00:00:00 2001
From: Jim Meyering meyer...@redhat.com
Date: Wed, 16 May 2012 07:26:36 +0200
Subject: [PATCH] maint: tell xgettext that fputs arg 93% of... is not a C
format string
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* src/fmt.c (usage): Add a comment to tell
xgettext that the % o in fputs argument string of ...93% of...
is not a C format string. Reported by Toomas Soome, Göran Uddeborg,
Petr Pisar, Primoz PETERLIN and Chusslove Illich via
http://bugs.gnu.org/11470
---
THANKS.in | 4
src/fmt.c | 2 ++
2 files changed, 6 insertions(+)
diff --git a/THANKS.in b/THANKS.in
index 5c7dde8..6c826af 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -121,6 +121,7 @@ Christian Rose ment...@menthos.com
Christian von Roquesroq...@pond.sub.org
Christophe LYON christophe.l...@st.com
Chuck Hedrick hedr...@klinzhai.rutgers.edu
+Chusslove Illichcaslav.i...@gmx.net
Clark Morgancmor...@aracnet.com
Clement Wangclem.w...@overture.com
Colin Plumb co...@nyx.net
@@ -482,6 +483,7 @@ Peter Horst pe...@ointment.org
Peter Moulder rei...@netspace.net.au
Peter Samuelson psamu...@sampo.creighton.edu
Peter Seebach se...@taniemarie.solon.com
+Petr Pisar petr.pi...@atlas.cz
Petr Uzel petr.u...@suse.cz
Petter Reinholdtsen p...@hungry.com
Phelippe Neveu pne...@pcigeomatics.com
@@ -496,6 +498,7 @@ Piotr Gackiewiczga...@intertele.pl
Piotr Kwapulinski k...@univ.gda.pl
Prashant TR t...@eth.net
Priit Jõerüüt jemm4j...@yahoo.com
+Primoz PETERLIN primozz.peter...@gmail.com
Rainer Orth r...@techfak.uni-bielefeld.de
Ralf W. Stephan step...@tmt.de
Ralph Loaderloa...@maths.ox.ac.uk
@@ -593,6 +596,7 @@ Ton Nijkes t...@murphy.nl
Tony Kocurkoakocu...@mun.ca
Tony Leneis t...@plaza.ds.adp.com
Tony Robinson a...@eng.cam.ac.uk
+Toomas Soometoomas.so...@elion.ee
Toralf Förster toralf.foers...@gmx.de
Torbjorn Granlund t...@nada.kth.se
Torbjorn Lindgren t...@funcom.no
diff --git a/src/fmt.c b/src/fmt.c
index 3da198e..3e93654 100644
--- a/src/fmt.c
+++ b/src/fmt.c
@@ -281,10 +281,12 @@ Mandatory arguments to long options are mandatory for
short options too.\n\
-p, --prefix=STRING reformat only lines beginning with STRING,\n\
reattaching the prefix to reformatted lines\n\
-s, --split-only split long lines, but do not refill\n\
),
stdout);
+ /* Tell xgettext that the % o below is not a printf-style
+ format string: xgettext:no-c-format */
fputs (_(\
-t, --tagged-paragraphindentation of first line different from second\n\
-u, --uniform-spacing one space between words, two after sentences\n\
-w, --width=WIDTH maximum line width (default of 75 columns)\n\
-g, --goal=WIDTH goal width (default of 93% of width)\n\
--
1.7.10.2.520.g6a4a482
