diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-10-30 13:28:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-30 13:28:11 -0400 |
| commit | 07276cf62ad5a32ae7a9867029a05a4fbb141d5c (patch) | |
| tree | 3eaac7c7fe07db8b44893341ec885e4dfc31d8c8 /src/common/string_util.cpp | |
| parent | 79d3cef8db5c6e43463434f966316caaa685488f (diff) | |
| parent | f04bc172ae4a24ae4431d65eabfedcc8667eb0bd (diff) | |
Merge pull request #11908 from t895/log-spam
android: Fix URI parsing in native code
Diffstat (limited to 'src/common/string_util.cpp')
| -rw-r--r-- | src/common/string_util.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp index 4c7aba3f5..72c481798 100644 --- a/src/common/string_util.cpp +++ b/src/common/string_util.cpp @@ -14,6 +14,10 @@ #include <windows.h> #endif +#ifdef ANDROID +#include <common/fs/fs_android.h> +#endif + namespace Common { /// Make a string lowercase @@ -63,6 +67,14 @@ bool SplitPath(const std::string& full_path, std::string* _pPath, std::string* _ if (full_path.empty()) return false; +#ifdef ANDROID + if (full_path[0] != '/') { + *_pPath = Common::FS::Android::GetParentDirectory(full_path); + *_pFilename = Common::FS::Android::GetFilename(full_path); + return true; + } +#endif + std::size_t dir_end = full_path.find_last_of("/" // windows needs the : included for something like just "C:" to be considered a directory #ifdef _WIN32 |