handle config files with <CR><LF> (DOS line ending) ported from volker_dev (r826)

git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@920 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
This commit is contained in:
michael
2008-12-31 06:12:29 +00:00
parent ba0421af85
commit 0caadb6cee
+6 -2
View File
@@ -132,15 +132,19 @@ static char *strip(char *s, const int strip_comments)
if (*p == '"')
do
p++;
while (*p && *p != '\n' && *p != '"');
while (*p && *p != '\n' && *p != '\r' && *p != '"');
if (*p == '\'')
do
p++;
while (*p && *p != '\n' && *p != '\'');
while (*p && *p != '\n' && *p != '\r' && *p != '\'');
if (*p == '\n' || (strip_comments && *p == '#' && (p == s || *(p - 1) != '\\'))) {
*p = '\0';
break;
}
if (*p == '\r' && *(p + 1) == '\n') {
/* replace <CR> from DOS <CR><LF> with blank */
*p = ' ';
}
}
for (p--; p > s && isblank(*p); p--)