Skip to content

Commit 612c280

Browse files
committed
kconfig: fix update-po-config to accect backslash in input
Massimo Maiurana reported (slightly edited): ===== 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. 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. ===== This patch implements the suggested escaping. Reported-by: Massimo Maiurana <maiurana@gmail.com> Tested-by: Massimo Maiurana <maiurana@gmail.com> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
1 parent 79ff807 commit 612c280

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

scripts/kconfig/kxgettext.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ static char *escape(const char* text, char *bf, int len)
4343
++text;
4444
goto next;
4545
}
46+
else if (*text == '\\') {
47+
*bfp++ = '\\';
48+
len--;
49+
}
4650
*bfp++ = *text++;
4751
next:
4852
--len;

0 commit comments

Comments
 (0)