flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed issue with quotes not appearing in pairs

Browse Source
This commit is contained in:
flx5 2015-03-11 19:52:49 +01:00
parent 76012ee090
commit d8ab99e944
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/StringUtils.cpp
View File

@ -146,6 +146,7 @@ AStringVector StringSplitWithQuotes(const AString & str, const AString & delim)
size_t cutAt = 0; size_t cutAt = 0;
size_t Prev = 0; size_t Prev = 0;
size_t cutAtQuote = 0;
while ((cutAt = str.find_first_of(delim, Prev)) != str.npos) while ((cutAt = str.find_first_of(delim, Prev)) != str.npos)
{ {
@ -153,11 +154,11 @@ AStringVector StringSplitWithQuotes(const AString & str, const AString & delim)
if ((current.at(0) == '"') || (current.at(0) == '\'')) if ((current.at(0) == '"') || (current.at(0) == '\''))
{ {
Prev += 1; Prev += 1;
cutAt = str.find_first_of(current.at(0), Prev); cutAtQuote = str.find_first_of(current.at(0), Prev);
if (cutAt != str.npos) if (cutAtQuote != str.npos)
{ {
current = str.substr(Prev, cutAt - Prev); current = str.substr(Prev, cutAtQuote - Prev);
cutAt += 1; cutAt = cutAtQuote + 1;
} }
} }