Commit d3660a8c authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Sam Ravnborg
Browse files

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: default avatarMatthew Wilcox <matthew@wil.cx>
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent 4f5537de
......@@ -193,8 +193,11 @@ int conf_read_simple(const char *name, int def)
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 @@ int conf_read_simple(const char *name, int def)
;
}
break;
case '\r':
case '\n':
break;
default:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment