diff options
| author | Zach Hilman <DarkLordZach@users.noreply.github.com> | 2018-07-23 22:40:35 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2018-07-23 19:40:35 -0700 |
| commit | 59cb258409c5cbd6cdc9cc6a6f8e858603924a2b (patch) | |
| tree | c024d285fe63daae9d73ef07800349a065768672 /src/common/file_util.cpp | |
| parent | f6657bc8d78c19d41cf64e6c0086f862b4b9a515 (diff) | |
VFS Regression and Accuracy Fixes (#776)
* Regression and Mode Fixes
* Review Fixes
* string_view correction
* Add operator& for FileSys::Mode
* Return std::string from SanitizePath
* Farming Simulator Fix
* Use != With mode operator&
Diffstat (limited to 'src/common/file_util.cpp')
| -rw-r--r-- | src/common/file_util.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp index 1bc291cf95..b8dd92b651 100644 --- a/src/common/file_util.cpp +++ b/src/common/file_util.cpp @@ -826,7 +826,7 @@ std::string_view GetPathWithoutTop(std::string_view path) { } while (path[0] == '\\' || path[0] == '/') { - path.remove_suffix(1); + path.remove_prefix(1); if (path.empty()) { return path; } @@ -870,6 +870,15 @@ std::string_view RemoveTrailingSlash(std::string_view path) { return path; } +std::string SanitizePath(std::string_view path_) { + std::string path(path_); + std::replace(path.begin(), path.end(), '\\', '/'); + path.erase(std::unique(path.begin(), path.end(), + [](char c1, char c2) { return c1 == '/' && c2 == '/'; }), + path.end()); + return std::string(RemoveTrailingSlash(path)); +} + IOFile::IOFile() {} IOFile::IOFile(const std::string& filename, const char openmode[], int flags) { |