Browse Source
Merge pull request #12389 from liamwhite/string-copy
path_util: copy output for GetParentPath
pull/15/merge
liamwhite
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
4 additions and
4 deletions
-
src/common/fs/path_util.cpp
-
src/common/fs/path_util.h
|
|
|
@ -418,9 +418,9 @@ std::string SanitizePath(std::string_view path_, DirectorySeparator directory_se |
|
|
|
return std::string(RemoveTrailingSlash(path)); |
|
|
|
} |
|
|
|
|
|
|
|
std::string_view GetParentPath(std::string_view path) { |
|
|
|
std::string GetParentPath(std::string_view path) { |
|
|
|
if (path.empty()) { |
|
|
|
return path; |
|
|
|
return std::string(path); |
|
|
|
} |
|
|
|
|
|
|
|
#ifdef ANDROID
|
|
|
|
@ -439,7 +439,7 @@ std::string_view GetParentPath(std::string_view path) { |
|
|
|
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) { |
|
|
|
|
|
|
|
@ -302,7 +302,7 @@ enum class DirectorySeparator { |
|
|
|
DirectorySeparator directory_separator = DirectorySeparator::ForwardSlash); |
|
|
|
|
|
|
|
// 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. |
|
|
|
[[nodiscard]] std::string_view GetPathWithoutTop(std::string_view path); |
|
|
|
|