RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 03:17:35 +00:00
Code Issues Activity Actions

AK: Add a canonicalized_path() convenience function.

Browse source 
This is the same as calling FileSystemPath(foo).string(). The majority of
clients only care about canonicalizing a path, so let's have an easy way
to express that.
This commit is contained in:
Andreas Kling 2019-07-15 06:49:28 +02:00
parent cd497accbe
commit 954a0b8efe
7 changed files with 33 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

24
AK/FileSystemPath.cpp
View file

@ -8,14 +8,14 @@ namespace AK {
FileSystemPath::FileSystemPath(const StringView& s)
: m_string(s)
{
m_is_valid = canonicalize();
canonicalize();
m_is_valid = true;
}
bool FileSystemPath::canonicalize(bool resolve_symbolic_links)
void FileSystemPath::canonicalize()
{
// FIXME: Implement "resolve_symbolic_links"
(void)resolve_symbolic_links;
auto parts = m_string.split('/');
auto parts = m_string.split_view('/');
int approximate_canonical_length = 0;
Vector<String> canonical_parts;
for (auto& part : parts) {
@ -26,23 +26,24 @@ bool FileSystemPath::canonicalize(bool resolve_symbolic_links)
canonical_parts.take_last();
continue;
}
if (!part.is_empty())
if (!part.is_empty()) {
approximate_canonical_length += part.length() + 1;
canonical_parts.append(part);
}
}
if (canonical_parts.is_empty()) {
m_string = m_basename = "/";
return true;
return;
}
m_basename = canonical_parts.last();
StringBuilder builder;
StringBuilder builder(approximate_canonical_length);
for (auto& cpart : canonical_parts) {
builder.append('/');
builder.append(cpart);
}
m_parts = move(canonical_parts);
m_string = builder.to_string();
return true;
}
bool FileSystemPath::has_extension(StringView extension) const
@ -52,4 +53,9 @@ bool FileSystemPath::has_extension(StringView extension) const
return m_string.to_lowercase().ends_with(extension_string.to_lowercase());
}
String canonicalized_path(const StringView& path)
{
return FileSystemPath(path).string();
}
}