diff options
author | Egry Gabor <gaboregry@t-online.hu> | 2005-09-03 18:55:14 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:05:49 -0400 |
commit | 964267e627966ffa018fc4a3e19e6bad337a9125 (patch) | |
tree | b13b700da9e5b674c6a819f8826b70d476a59139 | |
parent | c196eff3060270f155343b63ef3d06f31ccfcd2e (diff) |
[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>
-rw-r--r-- | scripts/kconfig/kxgettext.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/kconfig/kxgettext.c b/scripts/kconfig/kxgettext.c index ad1cb9451a24..abee55ca6174 100644 --- a/scripts/kconfig/kxgettext.c +++ b/scripts/kconfig/kxgettext.c | |||
@@ -14,6 +14,11 @@ static char *escape(const char* text, char *bf, int len) | |||
14 | { | 14 | { |
15 | char *bfp = bf; | 15 | char *bfp = bf; |
16 | int multiline = strchr(text, '\n') != NULL; | 16 | int multiline = strchr(text, '\n') != NULL; |
17 | int eol = 0; | ||
18 | int textlen = strlen(text); | ||
19 | |||
20 | if ((textlen > 0) && (text[textlen-1] == '\n')) | ||
21 | eol = 1; | ||
17 | 22 | ||
18 | *bfp++ = '"'; | 23 | *bfp++ = '"'; |
19 | --len; | 24 | --len; |
@@ -43,7 +48,7 @@ next: | |||
43 | --len; | 48 | --len; |
44 | } | 49 | } |
45 | 50 | ||
46 | if (multiline) | 51 | if (multiline && eol) |
47 | bfp -= 3; | 52 | bfp -= 3; |
48 | 53 | ||
49 | *bfp++ = '"'; | 54 | *bfp++ = '"'; |