OctaForge
/
libostd
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

drive/root/anchor should be strings

master
Daniel Kolesa 2018-04-14 18:03:43 +02:00
parent 263b686ef0
commit 6eee000b49
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
ostd/path.hh
View File

@ -110,7 +110,7 @@ struct path {
return seps[std::size_t(p_fmt)]; return seps[std::size_t(p_fmt)];
} }
path drive() const { std::string drive() const {
if (is_win()) { if (is_win()) {
if (p_path.substr(0, 2) == "\\\\") { if (p_path.substr(0, 2) == "\\\\") {
char const *endp = strchr(p_path.data() + 2, '\\'); char const *endp = strchr(p_path.data() + 2, '\\');
@ -121,28 +121,21 @@ struct path {
if (!pendp) { if (!pendp) {
return p_path; return p_path;
} }
return string_range{p_path.data(), pendp}; return std::string{p_path.data(), pendp};
} else if (p_path.length() >= 2) { } else if (has_letter()) {
char ltr = p_path[0] | 32; return p_path.substr(0, 2);
if ((p_path[1] == ':') && (ltr >= 'a') && (ltr <= 'z')) {
return p_path.substr(0, 2);
}
} }
} }
return path{""}; return "";
} }
path root() const { std::string root() const {
if (is_win()) { if (is_win()) {
if (p_path[0] == '\\') { if (
(!p_path.empty() && (p_path[0] == '\\')) ||
((p_path.length() >= 3) && (p_path[2] == '\\') && has_letter())
) {
return "\\"; return "\\";
} else if (p_path.length() >= 3) {
char ltr = p_path[0] | 32;
if ((p_path[1] == ':') && (ltr >= 'a') && (ltr <= 'z')) {
if (p_path[2] == '\\') {
return "\\";
}
}
} }
return ""; return "";
} }
@ -152,7 +145,7 @@ struct path {
return ""; return "";
} }
path anchor() const { std::string anchor() const {
auto ret = drive(); auto ret = drive();
ret.append(root()); ret.append(root());
return ret; return ret;
@ -278,6 +271,14 @@ private:
} }
} }
bool has_letter() const {
if (p_path.size() < 2) {
return false;
}
char ltr = p_path[0] | 32;
return (p_path[1] == ':') && (ltr >= 'a') && (ltr <= 'z');
}
std::string p_path; std::string p_path;
format p_fmt; format p_fmt;
}; };