yetangitu/recoll
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

stringToTokens bug with skipinit 0 (never used)

Browse source
This commit is contained in:
Jean-Francois Dockes 2013-10-18 13:05:53 +02:00
parent 79d8b0676a
commit cc2e0ce736
1 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/utils/smallut.cpp
View file

@ -365,18 +365,28 @@ void stringToTokens(const string& str, vector<string>& tokens,
{
string::size_type startPos = 0, pos;
for (pos = 0;;) {
// Skip initial delims, break if this eats all.
if (skipinit &&
(startPos = str.find_first_not_of(delims, pos)) == string::npos)
break;
// Skip initial delims, return empty if this eats all.
if (skipinit &&
(startPos = str.find_first_not_of(delims, 0)) == string::npos) {
return;
}
while (startPos < str.size()) {
// Find next delimiter or end of string (end of token)
pos = str.find_first_of(delims, startPos);
// Add token to the vector. Note: token cant be empty here
if (pos == string::npos)
// Add token to the vector and adjust start
if (pos == string::npos) {
tokens.push_back(str.substr(startPos));
else
break;
} else if (pos == startPos) {
// Dont' push empty tokens after first
if (tokens.empty())
tokens.push_back(string());
startPos = ++pos;
} else {
tokens.push_back(str.substr(startPos, pos - startPos));
startPos = ++pos;
}
}
}