summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wilcox <matthew@wil.cx>2006-07-13 12:54:07 -0600
committerSam Ravnborg <sam@neptun.ravnborg.org>2006-09-25 09:00:00 +0200
commitd3660a8cbdfad620af88b85b7bbfff29160f14c2 (patch)
treec79e6a3362e0e0831cf3a9b0b8bd9a3b7a7e79f1
parent4f5537de7c1531398e84e18a24f667e49cc94208 (diff)
downloadlinux-stable-d3660a8cbdfad620af88b85b7bbfff29160f14c2.tar.gz
linux-stable-d3660a8cbdfad620af88b85b7bbfff29160f14c2.tar.bz2
linux-stable-d3660a8cbdfad620af88b85b7bbfff29160f14c2.zip
kconfig: support DOS line endings
Kconfig doesn't currently handle config files with DOS line endings. While these are, of course, an abomination, etc, etc, it can be handy to not have to convert them first. It's also a tiny patch and even adds support for lines ending in just \r or even \n\r. Signed-off-by: Matthew Wilcox <matthew@wil.cx> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
-rw-r--r--scripts/kconfig/confdata.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index a69d8acbf274..69f96b398c22 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -193,8 +193,11 @@ load:
continue;
*p++ = 0;
p2 = strchr(p, '\n');
- if (p2)
- *p2 = 0;
+ if (p2) {
+ *p2-- = 0;
+ if (*p2 == '\r')
+ *p2 = 0;
+ }
if (def == S_DEF_USER) {
sym = sym_find(line + 7);
if (!sym) {
@@ -266,6 +269,7 @@ load:
;
}
break;
+ case '\r':
case '\n':
break;
default: