citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Merge pull request #5224 from FearlessTobi/port-3630 

Port yuzu-emu/yuzu#3630: "common/file_util: Allow access to files on network shares"
This commit is contained in:
Ben 2020-05-13 18:28:01 +02:00 committed by GitHub
parent 63c86f2417 fb941c56d8
commit 307b8f923b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/file_util.cpp
View File

@ -902,7 +902,14 @@ std::string SanitizePath(std::string_view path_, DirectorySeparator directory_se
} }
std::replace(path.begin(), path.end(), type1, type2); std::replace(path.begin(), path.end(), type1, type2);
path.erase(std::unique(path.begin(), path.end(),
auto start = path.begin();
#ifdef _WIN32
// allow network paths which start with a double backslash (e.g. \\server\share)
if (start != path.end())
++start;
#endif
path.erase(std::unique(start, path.end(),
[type2](char c1, char c2) { return c1 == type2 && c2 == type2; }), [type2](char c1, char c2) { return c1 == type2 && c2 == type2; }),
path.end()); path.end());
return std::string(RemoveTrailingSlash(path)); return std::string(RemoveTrailingSlash(path));