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

Kernel: Make KLexicalPath::basename() more compliant

Browse source 
This removes some assertions from KLexicalPath::basename() by supporting
paths with trailing slashes, empty paths, paths consisting of only
slashes and paths with ending "." and ".." segments.
This commit is contained in:
Max Wipfli 2021-07-11 13:00:51 +02:00 • committed by Andreas Kling
parent a3638639a1
commit 9ab528ff5c
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Kernel/KLexicalPath.cpp
View file

@ -8,6 +8,8 @@
namespace Kernel::KLexicalPath {
static StringView const s_single_dot = "."sv;
bool is_absolute(StringView const& path)
{
return !path.is_empty() && path[0] == '/';
@ -29,15 +31,20 @@ bool is_canonical(StringView const& path)
return true;
}
StringView basename(StringView const& path)
StringView basename(StringView const& a_path)
{
if (a_path == "/"sv)
return a_path;
if (a_path.is_empty())
return s_single_dot;
auto path = a_path.trim("/"sv, TrimMode::Right);
// NOTE: If it's empty now, it means the path was just a series of slashes.
if (path.is_empty())
return a_path.substring_view(0, 1);
auto slash_index = path.find_last('/');
if (!slash_index.has_value()) {
VERIFY(!path.is_empty());
if (!slash_index.has_value())
return path;
}
auto basename = path.substring_view(*slash_index + 1);
VERIFY(!basename.is_empty() && basename != "."sv && basename != ".."sv);
return basename;
}