walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Cppcheck: Try to fix addon problems when paths have spaces

This commit is contained in:
Daniel Marjamäki 2020-08-30 18:15:48 +02:00
parent 51a6f154e0
commit d23fd26ce0
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/cppcheck.cpp
View File

@ -168,21 +168,22 @@ static std::vector<std::string> split(const std::string &str, const std::string
{ {
std::vector<std::string> ret; std::vector<std::string> ret;
for (std::string::size_type startPos = 0U; startPos < str.size();) { for (std::string::size_type startPos = 0U; startPos < str.size();) {
std::string::size_type endPos; startPos = str.find_first_not_of(sep, startPos);
if (str[startPos] == '\"') { if (startPos == std::string::npos)
endPos = str.find("\"", startPos + 1);
if (endPos < str.size())
endPos++;
} else {
endPos = str.find(sep, startPos + 1);
}
if (endPos == std::string::npos) {
ret.push_back(str.substr(startPos));
break; break;
if (str[startPos] == '\"') {
const std::string::size_type endPos = str.find("\"", startPos + 1);
ret.push_back(str.substr(startPos + 1, endPos - startPos - 1));
startPos = (endPos < str.size()) ? (endPos + 1) : endPos;
continue;
} }
const std::string::size_type endPos = str.find(sep, startPos + 1);
ret.push_back(str.substr(startPos, endPos - startPos)); ret.push_back(str.substr(startPos, endPos - startPos));
startPos = str.find_first_not_of(sep, endPos); startPos = endPos;
} }
return ret; return ret;
} }