lkml.org 
[lkml]   [2009]   [Apr]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: kconfig: update-po-config broken in 2.6.29
On Tue, Apr 07, 2009 at 08:56:36PM +0200, Massimo Maiurana wrote:
> hi,
> in latest 2.6.29 "make update-po-config" fails at msguniq invocation
> with an "invalid control sequence" error.
> the offending string is the following, and it's located in
> drivers/staging/panel/Kconfig:72:
> "'\e[L' which are specific to the LCD, and a few ANSI codes. The"
>
> looks to me like gettext expects strings in printf format, so in
> this case it thinks "\e" is a control sequence but doesn't recognise
> it as a valid one.
>
> I can still obtain a suitable linux.pot file escaping the backslash,
> and the resulting linux.mo file works even if the string is again
> unescaped, but of course if I leave the escaped string it will be
> displayed as-is (with a double backslash) if i run a configurator in
> english, so it is not a valid solution for a patch.
>
> Maybe a valid solution would be to tell kxgettext to automatically
> escape this kind of strings in the */config.pot he produces, so that
> msguniq would not complain?... I don't really know, and I don't even
> know how to do it. I see there is an escape function right at the
> top of kxgettext.c, but as I'm not a coder I don't really know how
> to hack it, so it's up to you... sorry.
Seems like a simple solution - thank for analyzing it!

Could you try following (untested) patch and see if that works
for you.

Thanks,
Sam

diff --git a/scripts/kconfig/kxgettext.c b/scripts/kconfig/kxgettext.c
index 6eb72a7..8d9ce22 100644
--- a/scripts/kconfig/kxgettext.c
+++ b/scripts/kconfig/kxgettext.c
@@ -43,6 +43,10 @@ static char *escape(const char* text, char *bf, int len)
++text;
goto next;
}
+ else if (*text == '\\') {
+ *bfp++ = '\\';
+ len--;
+ }
*bfp++ = *text++;
next:
--len;

\
 
 \ /
  Last update: 2009-04-07 21:19    [W:0.821 / U:0.004 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site