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

Refactor Path::getRelativePath()

This commit is contained in:
Daniel Marjamäki 2018-04-18 22:23:38 +02:00
parent 389fc0c1ee
commit b459da2ac3
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/path.cpp
View File

@ -161,15 +161,17 @@ bool Path::isAbsolute(const std::string& path)
std::string Path::getRelativePath(const std::string& absolutePath, const std::vector<std::string>& basePaths) std::string Path::getRelativePath(const std::string& absolutePath, const std::vector<std::string>& basePaths)
{ {
for (std::vector<std::string>::const_iterator i = basePaths.begin(); i != basePaths.end(); ++i) { for (const std::string &bp : basePaths) {
if (absolutePath == *i || i->empty()) // Seems to be a file, or path is empty if (absolutePath == bp || bp.empty()) // Seems to be a file, or path is empty
continue; continue;
bool endsWithSep = endsWith(*i,'/'); if (absolutePath.compare(0, bp.length(), bp) != 0)
if (absolutePath.compare(0, i->length(), *i) == 0 && absolutePath[i->length() - (endsWithSep?1:0)] == '/') { continue;
std::string rest = absolutePath.substr(i->length() + (endsWithSep?0:1));
return rest; if (endsWith(bp,'/'))
} return absolutePath.substr(bp.length());
else if (absolutePath.size() > bp.size() && absolutePath[bp.length()] == '/')
return absolutePath.substr(bp.length() + 1);
} }
return absolutePath; return absolutePath;
} }