max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-22 14:06:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

baseNameOf(): Remove all trailing slashes

Browse source
This commit is contained in:
Robert Hensing 2024-03-24 01:38:22 +01:00
parent 754a15e2db
commit 9884018dfa
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libutil/file-system.cc
View file

@ -128,7 +128,7 @@ std::string_view baseNameOf(std::string_view path)
return ""; return "";
auto last = path.size() - 1; auto last = path.size() - 1;
if (path[last] == '/' && last > 0) while (last > 0 && path[last] == '/')
last -= 1; last -= 1;
auto pos = path.rfind('/', last); auto pos = path.rfind('/', last);

10
tests/unit/libutil/tests.cc
View file

@ -151,6 +151,16 @@ namespace nix {
ASSERT_EQ(p1, "dir"); ASSERT_EQ(p1, "dir");
} }
TEST(baseNameOf, trailingSlashes) {
auto p1 = baseNameOf("/dir//");
ASSERT_EQ(p1, "dir");
}
TEST(baseNameOf, absoluteNothingSlashNothing) {
auto p1 = baseNameOf("//");
ASSERT_EQ(p1, "");
}
/* ---------------------------------------------------------------------------- /* ----------------------------------------------------------------------------
* isInDir * isInDir
* --------------------------------------------------------------------------*/ * --------------------------------------------------------------------------*/