OpenPunk/yuzu
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2024-12-25 18:20:04 +00:00
Code Issues Projects Releases Wiki Activity

file_util: Add platform-specific slash option to SanitizePath

Browse Source
This commit is contained in:
Zach Hilman 2018-08-03 11:47:35 -04:00
parent 3bf488ce52
commit 3f82dad1e4
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/file_util.cpp
View File

@ -884,11 +884,21 @@ std::string_view RemoveTrailingSlash(std::string_view path) {
return path;
}
std::string SanitizePath(std::string_view path_) {
std::string SanitizePath(std::string_view path_, bool with_platform_slashes) {
std::string path(path_);
std::replace(path.begin(), path.end(), '\\', '/');
char type1 = '\\';
char type2 = '/';
if (with_platform_slashes) {
#ifdef _WIN32
type1 = '/';
type2 = '\\';
#endif
}
std::replace(path.begin(), path.end(), type1, type2);
path.erase(std::unique(path.begin(), path.end(),
[](char c1, char c2) { return c1 == '/' && c2 == '/'; }),
[type2](char c1, char c2) { return c1 == type2 && c2 == type2; }),
path.end());
return std::string(RemoveTrailingSlash(path));
}

5
src/common/file_util.h
View File

@ -182,8 +182,9 @@ std::vector<T> SliceVector(const std::vector<T>& vector, size_t first, size_t la
return std::vector<T>(vector.begin() + first, vector.begin() + first + last);
}
// Removes trailing slash, makes all '\\' into '/', and removes duplicate '/'.
std::string SanitizePath(std::string_view path);
// Removes trailing slash, makes all '\\' into '/', and removes duplicate '/'. Makes '/' into '\\'
// if windows and with_platform_slashes is true.
std::string SanitizePath(std::string_view path, bool with_platform_slashes = false);
// simple wrapper for cstdlib file functions to
// hopefully will make error checking easier