mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-20 10:13:23 +02:00
Merge pull request #12389 from liamwhite/string-copy
path_util: copy output for GetParentPath
This commit is contained in:
commit
b8c5027686
@ -418,9 +418,9 @@ std::string SanitizePath(std::string_view path_, DirectorySeparator directory_se
|
|||||||
return std::string(RemoveTrailingSlash(path));
|
return std::string(RemoveTrailingSlash(path));
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string_view GetParentPath(std::string_view path) {
|
std::string GetParentPath(std::string_view path) {
|
||||||
if (path.empty()) {
|
if (path.empty()) {
|
||||||
return path;
|
return std::string(path);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef ANDROID
|
#ifdef ANDROID
|
||||||
@ -439,7 +439,7 @@ std::string_view GetParentPath(std::string_view path) {
|
|||||||
name_index = std::max(name_bck_index, name_fwd_index);
|
name_index = std::max(name_bck_index, name_fwd_index);
|
||||||
}
|
}
|
||||||
|
|
||||||
return path.substr(0, name_index);
|
return std::string(path.substr(0, name_index));
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string_view GetPathWithoutTop(std::string_view path) {
|
std::string_view GetPathWithoutTop(std::string_view path) {
|
||||||
|
@ -302,7 +302,7 @@ enum class DirectorySeparator {
|
|||||||
DirectorySeparator directory_separator = DirectorySeparator::ForwardSlash);
|
DirectorySeparator directory_separator = DirectorySeparator::ForwardSlash);
|
||||||
|
|
||||||
// Gets all of the text up to the last '/' or '\' in the path.
|
// Gets all of the text up to the last '/' or '\' in the path.
|
||||||
[[nodiscard]] std::string_view GetParentPath(std::string_view path);
|
[[nodiscard]] std::string GetParentPath(std::string_view path);
|
||||||
|
|
||||||
// Gets all of the text after the first '/' or '\' in the path.
|
// Gets all of the text after the first '/' or '\' in the path.
|
||||||
[[nodiscard]] std::string_view GetPathWithoutTop(std::string_view path);
|
[[nodiscard]] std::string_view GetPathWithoutTop(std::string_view path);
|
||||||
|
Loading…
Reference in New Issue
Block a user