diff options
author | BreadFish64 <breadfish64@users.noreply.github.com> | 2023-12-06 05:17:19 +0100 |
---|---|---|
committer | Liam <byteslice@airmail.cc> | 2023-12-06 05:17:19 +0100 |
commit | d5de9402ee22eea985d6842baafd8922e15d3784 (patch) | |
tree | f302a3a87aad12213c36ef00cd28c86e3e27ba61 /src/common/fs | |
parent | Merge pull request #12271 from liamwhite/pretext-fix (diff) | |
download | yuzu-d5de9402ee22eea985d6842baafd8922e15d3784.tar yuzu-d5de9402ee22eea985d6842baafd8922e15d3784.tar.gz yuzu-d5de9402ee22eea985d6842baafd8922e15d3784.tar.bz2 yuzu-d5de9402ee22eea985d6842baafd8922e15d3784.tar.lz yuzu-d5de9402ee22eea985d6842baafd8922e15d3784.tar.xz yuzu-d5de9402ee22eea985d6842baafd8922e15d3784.tar.zst yuzu-d5de9402ee22eea985d6842baafd8922e15d3784.zip |
Diffstat (limited to 'src/common/fs')
-rw-r--r-- | src/common/fs/path_util.cpp | 38 | ||||
-rw-r--r-- | src/common/fs/path_util.h | 6 |
2 files changed, 33 insertions, 11 deletions
diff --git a/src/common/fs/path_util.cpp b/src/common/fs/path_util.cpp index c3a81f9a9..d2f50432a 100644 --- a/src/common/fs/path_util.cpp +++ b/src/common/fs/path_util.cpp @@ -354,18 +354,36 @@ std::string_view RemoveTrailingSlash(std::string_view path) { return path; } -std::vector<std::string> SplitPathComponents(std::string_view filename) { - std::string copy(filename); - std::replace(copy.begin(), copy.end(), '\\', '/'); - std::vector<std::string> out; - - std::stringstream stream(copy); - std::string item; - while (std::getline(stream, item, '/')) { - out.push_back(std::move(item)); +template <typename F> +static void ForEachPathComponent(std::string_view filename, F&& cb) { + const char* component_begin = filename.data(); + const char* const end = component_begin + filename.size(); + for (const char* it = component_begin; it != end; ++it) { + const char c = *it; + if (c == '\\' || c == '/') { + if (component_begin != it) { + cb(std::string_view{component_begin, it}); + } + component_begin = it + 1; + } } + if (component_begin != end) { + cb(std::string_view{component_begin, end}); + } +} + +std::vector<std::string_view> SplitPathComponents(std::string_view filename) { + std::vector<std::string_view> components; + ForEachPathComponent(filename, [&](auto component) { components.emplace_back(component); }); + + return components; +} + +std::vector<std::string> SplitPathComponentsCopy(std::string_view filename) { + std::vector<std::string> components; + ForEachPathComponent(filename, [&](auto component) { components.emplace_back(component); }); - return out; + return components; } std::string SanitizePath(std::string_view path_, DirectorySeparator directory_separator) { diff --git a/src/common/fs/path_util.h b/src/common/fs/path_util.h index 2874ea738..23c8b1359 100644 --- a/src/common/fs/path_util.h +++ b/src/common/fs/path_util.h @@ -289,7 +289,11 @@ enum class DirectorySeparator { // Splits the path on '/' or '\' and put the components into a vector // i.e. "C:\Users\Yuzu\Documents\save.bin" becomes {"C:", "Users", "Yuzu", "Documents", "save.bin" } -[[nodiscard]] std::vector<std::string> SplitPathComponents(std::string_view filename); +[[nodiscard]] std::vector<std::string_view> SplitPathComponents(std::string_view filename); + +// Splits the path on '/' or '\' and put the components into a vector +// i.e. "C:\Users\Yuzu\Documents\save.bin" becomes {"C:", "Users", "Yuzu", "Documents", "save.bin" } +[[nodiscard]] std::vector<std::string> SplitPathComponentsCopy(std::string_view filename); // Removes trailing slash, makes all '\\' into '/', and removes duplicate '/'. Makes '/' into '\\' // depending if directory_separator is BackwardSlash or PlatformDefault and running on windows |