Techwizz/xboxdrv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed \r\n newlines causing errors in INIParser, ignore \r like whitespace

Browse source 
Fixes #153
This commit is contained in:
Ingo Ruhnke 2015-11-03 19:58:23 +01:00
parent cf14784cdb
commit 36f8f0cad0
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/ini_parser.cpp
View file

@ -48,7 +48,7 @@ INIParser::run()
eat_rest_of_line();
newline();
}
else if (accept(' ') || accept('\t') || accept('\n'))
else if (accept(' ') || accept('\t') || accept('\n') || accept('\r'))
{
// eat whitespace
}
@ -206,9 +206,9 @@ INIParser::get_value()
char last_c = -1;
while(peek() != '\n' &&
peek() != -1 &&
!((last_c == ' ' || last_c == '\t') && (peek() == ';' || peek() == '#')))
!((last_c == ' ' || last_c == '\t' || last_c == '\r') && (peek() == ';' || peek() == '#')))
{
if (peek() != ' ' && peek() != '\t')
if (peek() != ' ' && peek() != '\t' && peek() != '\r')
{
last_char = cur;
}
@ -242,9 +242,9 @@ INIParser::get_ident()
while(peek() != '\n' &&
peek() != -1 &&
peek() != '=' &&
!((last_c == ' ' || last_c == '\t') && (peek() == ';' || peek() == '#')))
!((last_c == ' ' || last_c == '\t' || last_c == '\r') && (peek() == ';' || peek() == '#')))
{
if (peek() != ' ' && peek() != '\t')
if (peek() != ' ' && peek() != '\t' && peek() != '\r')
{
last_char = cur;
}
@ -339,7 +339,7 @@ INIParser::get_section()
void
INIParser::whitespace()
{
while(peek() == ' ' || peek() == '\t')
while(peek() == ' ' || peek() == '\t' || peek() == '\r')
{
next();
}