diff options
| author | Zach Hilman <zachhilman@gmail.com> | 2018-08-03 11:47:35 -0400 |
|---|---|---|
| committer | Zach Hilman <zachhilman@gmail.com> | 2018-08-08 21:18:45 -0400 |
| commit | 3f82dad1e411130e309074a1547fb2104257f95d (patch) | |
| tree | 136536a8aa82f557bb6a9f50e85ccad5819a4baa /src | |
| parent | 3bf488ce520a81811bf6e949e2153aabf4b713ea (diff) | |
file_util: Add platform-specific slash option to SanitizePath
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/file_util.cpp | 16 | ||||
| -rw-r--r-- | src/common/file_util.h | 5 |
2 files changed, 16 insertions, 5 deletions
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp index 7aeda737f4..190cac6d9d 100644 --- a/src/common/file_util.cpp +++ b/src/common/file_util.cpp @@ -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)); } diff --git a/src/common/file_util.h b/src/common/file_util.h index d0987fb572..ca63d74661 100644 --- a/src/common/file_util.h +++ b/src/common/file_util.h @@ -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 |