asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #52744 from theraot/3.x

Browse source 
[3.x] Fix get_base_dir windows top level directory logic
This commit is contained in:
Rémi Verschelde 2021-09-16 14:12:57 +02:00 committed by GitHub
commit 4850e7eaca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
core/ustring.cpp
View file

@ -3967,26 +3967,42 @@ bool String::is_rel_path() const {
}
String String::get_base_dir() const {
int 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(":\\");
}
String rs;
String base;
if (basepos != -1) {
int end = basepos + 3;
rs = substr(end, length());
base = substr(0, end);
} else {
if (begins_with("/")) {
rs = substr(1, length());
base = "/";
} else {
rs = *this;
end = basepos + 2;
}
}
int sep = MAX(rs.find_last("/"), rs.find_last("\\"));
// unix root directory base
if (end == 0) {
if (begins_with("/")) {
end = 1;
}
}
String rs;
String base;
if (end != 0) {
rs = substr(end, length());
base = substr(0, end);
} else {
rs = *this;
}
int sep = MAX(rs.rfind("/"), rs.rfind("\\"));
if (sep == -1) {
return base;
}