Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 964267e627966ffa018fc4a3e19e6bad337a9125

Authored by Egry Gabor
Committed by Linus Torvalds
1 parent c196eff306
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PATCH] kconfig: kxgettext: EOL fix 

The end of line character doesn't exist on end of help in all case, check it
first.

Signed-off-by: Egry Gabor <gaboregry@t-online.hu>
Cc: Arnaldo Carvalho de Melo <acme@conectiva.com.br>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 1 changed file with 6 additions and 1 deletions Side-by-side Diff

scripts/kconfig/kxgettext.c
Diff comments   View file @ 964267e
... ... @@ -14,7 +14,12 @@
14 14 {
15 15 char *bfp = bf;
16 16 int multiline = strchr(text, '\n') != NULL;
  17 + int eol = 0;
  18 + int textlen = strlen(text);
17 19  
  20 + if ((textlen > 0) && (text[textlen-1] == '\n'))
  21 + eol = 1;
  22 +
18 23 *bfp++ = '"';
19 24 --len;
20 25  
... ... @@ -43,7 +48,7 @@
43 48 --len;
44 49 }
45 50  
46   - if (multiline)
  51 + if (multiline && eol)
47 52 bfp -= 3;
48 53  
49 54 *bfp++ = '"';