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

Fix CanonPath::parent()

Browse source 
This also fixes flake.lock loading.
This commit is contained in:
Eelco Dolstra 2022-05-19 00:08:51 +02:00
parent c80b942c6e
commit d7d93ebdc4
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libutil/canon-path.cc
View file

@ -16,14 +16,13 @@ CanonPath::CanonPath(std::string_view raw, const CanonPath & root)
std::optional<CanonPath> CanonPath::parent() const std::optional<CanonPath> CanonPath::parent() const
{ {
if (isRoot()) return std::nullopt; if (isRoot()) return std::nullopt;
return CanonPath(unchecked_t(), path.substr(0, path.rfind('/'))); return CanonPath(unchecked_t(), path.substr(0, std::max((size_t) 1, path.rfind('/'))));
} }
void CanonPath::pop() void CanonPath::pop()
{ {
assert(!isRoot()); assert(!isRoot());
auto slash = path.rfind('/'); path.resize(std::max((size_t) 1, path.rfind('/')));
path.resize(std::max((size_t) 1, slash));
} }
bool CanonPath::isWithin(const CanonPath & parent) const bool CanonPath::isWithin(const CanonPath & parent) const

3
src/libutil/tests/canon-path.cc
View file

@ -11,6 +11,7 @@ namespace nix {
ASSERT_EQ(p.rel(), ""); ASSERT_EQ(p.rel(), "");
ASSERT_EQ(p.baseName(), std::nullopt); ASSERT_EQ(p.baseName(), std::nullopt);
ASSERT_EQ(p.dirOf(), std::nullopt); ASSERT_EQ(p.dirOf(), std::nullopt);
ASSERT_FALSE(p.parent());
} }
{ {
@ -19,6 +20,7 @@ namespace nix {
ASSERT_EQ(p.rel(), "foo"); ASSERT_EQ(p.rel(), "foo");
ASSERT_EQ(*p.baseName(), "foo"); ASSERT_EQ(*p.baseName(), "foo");
ASSERT_EQ(*p.dirOf(), ""); // FIXME: do we want this? ASSERT_EQ(*p.dirOf(), ""); // FIXME: do we want this?
ASSERT_EQ(p.parent()->abs(), "/");
} }
{ {
@ -27,6 +29,7 @@ namespace nix {
ASSERT_EQ(p.rel(), "foo/bar"); ASSERT_EQ(p.rel(), "foo/bar");
ASSERT_EQ(*p.baseName(), "bar"); ASSERT_EQ(*p.baseName(), "bar");
ASSERT_EQ(*p.dirOf(), "/foo"); ASSERT_EQ(*p.dirOf(), "/foo");
ASSERT_EQ(p.parent()->abs(), "/foo");
} }
{ {