From d3660a8cbdfad620af88b85b7bbfff29160f14c2 Mon Sep 17 00:00:00 2001 From: Matthew Wilcox Date: Thu, 13 Jul 2006 12:54:07 -0600 Subject: [PATCH] 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 Signed-off-by: Sam Ravnborg --- scripts/kconfig/confdata.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index a69d8acbf2..69f96b398c 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: -- 2.39.5