From 59cb258409c5cbd6cdc9cc6a6f8e858603924a2b Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Mon, 23 Jul 2018 22:40:35 -0400 Subject: 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& --- src/common/file_util.cpp | 11 ++++++++++- src/common/file_util.h | 3 +++ 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'src/common') diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp index 1bc291cf9..b8dd92b65 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) { diff --git a/src/common/file_util.h b/src/common/file_util.h index abfa79eae..bc9272d89 100644 --- a/src/common/file_util.h +++ b/src/common/file_util.h @@ -178,6 +178,9 @@ std::vector SliceVector(const std::vector& vector, size_t first, size_t la return std::vector(vector.begin() + first, vector.begin() + first + last); } +// Removes trailing slash, makes all '\\' into '/', and removes duplicate '/'. +std::string SanitizePath(std::string_view path); + // simple wrapper for cstdlib file functions to // hopefully will make error checking easier // and make forgetting an fclose() harder -- cgit v1.2.3