archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-11 01:08:39 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert VFS

Browse source
This commit is contained in:
raven02 2014-12-18 00:05:29 +08:00
parent 621864be18
commit 52bf72787f
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
rpcs3/Emu/FS/VFS.cpp
View file

@ -32,12 +32,21 @@ std::string simplify_path(const std::string& path, bool is_dir)
{ {
std::vector<std::string> path_blocks = simplify_path_blocks(path); std::vector<std::string> path_blocks = simplify_path_blocks(path);
std::string result;
if (path_blocks.empty()) if (path_blocks.empty())
return ""; return result;
std::string result = fmt::merge(path_blocks, "/"); if (is_dir)
{
result = fmt::merge(path_blocks, "/");
}
else
{
result = fmt::merge(std::vector<std::string>(path_blocks.begin(), path_blocks.end() - 1), "/") + path_blocks[path_blocks.size() - 1];
}
return is_dir ? result + "/" : result; return result;
} }
VFS::~VFS() VFS::~VFS()