mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 06:57:45 +00:00
Fix mkdir with relative paths.
This commit is contained in:
parent
de4604ac95
commit
f5a0b6961c
5 changed files with 49 additions and 185 deletions
|
@ -30,32 +30,17 @@ bool FileSystemPath::canonicalize(bool resolveSymbolicLinks)
|
|||
canonicalParts.append(part);
|
||||
}
|
||||
if (canonicalParts.isEmpty()) {
|
||||
m_string = m_basename = m_dirname = "/";
|
||||
m_string = m_basename = "/";
|
||||
return true;
|
||||
}
|
||||
|
||||
m_basename = canonicalParts.last();
|
||||
|
||||
if (canonicalParts.size() == 1) {
|
||||
m_dirname = "/";
|
||||
} else {
|
||||
StringBuilder builder;
|
||||
for (size_t i = 0; i < canonicalParts.size() - 1; ++i) {
|
||||
auto& cpart = canonicalParts[i];
|
||||
builder.append('/');
|
||||
builder.append(cpart);
|
||||
}
|
||||
m_dirname = builder.build();
|
||||
}
|
||||
|
||||
{
|
||||
StringBuilder builder;
|
||||
for (auto& cpart : canonicalParts) {
|
||||
builder.append('/');
|
||||
builder.append(move(cpart));
|
||||
}
|
||||
m_string = builder.build();
|
||||
StringBuilder builder;
|
||||
for (auto& cpart : canonicalParts) {
|
||||
builder.append('/');
|
||||
builder.append(move(cpart));
|
||||
}
|
||||
m_string = builder.build();
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
@ -13,13 +13,11 @@ public:
|
|||
String string() const { return m_string; }
|
||||
|
||||
String basename() const { return m_basename; }
|
||||
String dirname() const { return m_dirname; }
|
||||
|
||||
private:
|
||||
bool canonicalize(bool resolveSymbolicLinks = false);
|
||||
|
||||
String m_string;
|
||||
String m_dirname;
|
||||
String m_basename;
|
||||
bool m_isValid { false };
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue