- fix bug when extracting filename
This commit is contained in:
parent
e3489350bd
commit
999c4c4110
|
|
@ -17,14 +17,17 @@
|
||||||
|
|
||||||
std::string StringHelper::extractFilename(const std::string& path)
|
std::string StringHelper::extractFilename(const std::string& path)
|
||||||
{
|
{
|
||||||
// Look for separator from end of string
|
if (path.empty())
|
||||||
for (int i = path.size() - 1; i >= 0; i--)
|
return std::string();
|
||||||
{
|
|
||||||
if (path[i] == '/' || path[i] == '\\')
|
|
||||||
return path.substr(i+1);
|
|
||||||
}
|
|
||||||
return "";
|
|
||||||
|
|
||||||
|
// Look for separator from end of string
|
||||||
|
std::string::size_type p_s = path.find_last_of('/'), p_bs = path.find_last_of('\\');
|
||||||
|
if (p_s == std::string::npos && p_bs == std::string::npos)
|
||||||
|
return path;
|
||||||
|
if (p_s != std::string::npos)
|
||||||
|
return path.substr(p_s + 1);
|
||||||
|
else
|
||||||
|
return path.substr(p_bs + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string StringHelper::appendPath(const std::string& s1, const std::string& s2)
|
std::string StringHelper::appendPath(const std::string& s1, const std::string& s2)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue