diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/string/ustring.cpp | 38 |
1 files changed, 27 insertions, 11 deletions
diff --git a/core/string/ustring.cpp b/core/string/ustring.cpp index a30d6b9102..2390d007db 100644 --- a/core/string/ustring.cpp +++ b/core/string/ustring.cpp @@ -4329,23 +4329,39 @@ bool String::is_rel_path() const { } String String::get_base_dir() const { - int basepos = find(":/"); - if (basepos == -1) { - basepos = find(":\\"); + int end = 0; + + // url scheme style base + int basepos = find("://"); + if (basepos != -1) { + end = basepos + 3; } + + // windows top level directory base + if (end == 0) { + basepos = find(":/"); + if (basepos == -1) { + basepos = find(":\\"); + } + if (basepos != -1) { + end = basepos + 2; + } + } + + // unix root directory base + if (end == 0) { + if (begins_with("/")) { + end = 1; + } + } + String rs; String base; - if (basepos != -1) { - int end = basepos + 3; + if (end != 0) { rs = substr(end, length()); base = substr(0, end); } else { - if (begins_with("/")) { - rs = substr(1, length()); - base = "/"; - } else { - rs = *this; - } + rs = *this; } int sep = MAX(rs.rfind("/"), rs.rfind("\\")); |