N-archive/suyu
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/suyu.git synced 2024-11-29 02:02:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12389 from liamwhite/string-copy

Browse source 
path_util: copy output for GetParentPath
This commit is contained in:
liamwhite 2023-12-17 19:01:04 -05:00 committed by GitHub
commit b8c5027686
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/common/fs/path_util.cpp
View file

@ -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) {

2
src/common/fs/path_util.h
View file

@ -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);