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

Yet more coding style fixes.

Browse source
This commit is contained in:
Andreas Kling 2018-12-03 01:38:22 +01:00
parent f31e1ceab0
commit aff89d2fd7
18 changed files with 197 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

20
AK/FileSystemPath.cpp
View file

@ -8,35 +8,35 @@ namespace AK {
FileSystemPath::FileSystemPath(const String& s)
: m_string(s)
{
m_isValid = canonicalize();
m_is_valid = canonicalize();
}
bool FileSystemPath::canonicalize(bool resolveSymbolicLinks)
bool FileSystemPath::canonicalize(bool resolve_symbolic_links)
{
// FIXME: Implement "resolveSymbolicLinks"
(void) resolveSymbolicLinks;
(void) resolve_symbolic_links;
auto parts = m_string.split('/');
Vector<String> canonicalParts;
Vector<String> canonical_parts;
for (auto& part : parts) {
if (part == ".")
continue;
if (part == "..") {
if (!canonicalParts.isEmpty())
canonicalParts.takeLast();
if (!canonical_parts.isEmpty())
canonical_parts.takeLast();
continue;
}
if (!part.isEmpty())
canonicalParts.append(part);
canonical_parts.append(part);
}
if (canonicalParts.isEmpty()) {
if (canonical_parts.isEmpty()) {
m_string = m_basename = "/";
return true;
}
m_basename = canonicalParts.last();
m_basename = canonical_parts.last();
StringBuilder builder;
for (auto& cpart : canonicalParts) {
for (auto& cpart : canonical_parts) {
builder.append('/');
builder.append(move(cpart));
}

6
AK/FileSystemPath.h
View file

@ -9,17 +9,17 @@ public:
FileSystemPath() { }
explicit FileSystemPath(const String&);
bool isValid() const { return m_isValid; }
bool is_valid() const { return m_is_valid; }
String string() const { return m_string; }
String basename() const { return m_basename; }
private:
bool canonicalize(bool resolveSymbolicLinks = false);
bool canonicalize(bool resolve_symbolic_links = false);
String m_string;
String m_basename;
bool m_isValid { false };
bool m_is_valid { false };
};
};