Carltonus/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Treat \t as whitespace in config files. Fixes #3050.

Browse Source 
This was SVN commit r16326.
This commit is contained in:
leper 2015-02-12 17:31:10 +00:00
parent 1e54289aa8
commit c049b0ae27
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/ps/ConfigDB.cpp
View File

@ -226,11 +226,11 @@ bool CConfigDB::Reload(EConfigNamespace ns)
return false; return false;
} }
} }
TConfigMap newMap; TConfigMap newMap;
char *filebuf = (char*)buffer.get(); char *filebuf = (char*)buffer.get();
char *filebufend = filebuf+buflen; char *filebufend = filebuf+buflen;
bool quoted = false; bool quoted = false;
CStr header; CStr header;
CStr name; CStr name;
@ -247,6 +247,7 @@ bool CConfigDB::Reload(EConfigNamespace ns)
case ' ': case ' ':
case '\r': case '\r':
case '\t':
continue; // ignore continue; // ignore
case '[': case '[':
@ -300,8 +301,9 @@ bool CConfigDB::Reload(EConfigNamespace ns)
--pos; // We should terminate the outer loop too --pos; // We should terminate the outer loop too
break; break;
case '\r':
case ' ': case ' ':
case '\r':
case '\t':
break; // ignore break; // ignore
case ',': case ',':
@ -327,7 +329,7 @@ bool CConfigDB::Reload(EConfigNamespace ns)
name.push_back(*pos); name.push_back(*pos);
continue; continue;
} }
// Consume the rest of the line // Consume the rest of the line
while (pos < filebufend && *pos != '\n') while (pos < filebufend && *pos != '\n')
++pos; ++pos;