nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-30 06:01:00 +01:00
Code Activity

Improve symlink handling

Browse source
This commit is contained in:
Eelco Dolstra 2022-05-17 13:56:26 +02:00
parent 2a53574675
commit df2aa29690
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
7 changed files with 51 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,11 +26,6 @@ void CanonPath::pop()
path.resize(std::max((size_t) 1, slash));
}
CanonPath CanonPath::resolveSymlinks() const
{
return CanonPath(unchecked_t(), canonPath(abs(), true));
}
bool CanonPath::isWithin(const CanonPath & parent) const
{
return !(

6
src/libutil/canon-path.hh
View file

@ -91,8 +91,8 @@ public:
}
};
Iterator begin() { return Iterator(rel()); }
Iterator end() { return Iterator(rel().substr(path.size() - 1)); }
Iterator begin() const { return Iterator(rel()); }
Iterator end() const { return Iterator(rel().substr(path.size() - 1)); }
std::optional<CanonPath> parent() const;
@ -136,8 +136,6 @@ public:
return i == path.end() && j != x.path.end();
}
CanonPath resolveSymlinks() const;
/* Return true if `this` is equal to `parent` or a child of
`parent`. */
bool isWithin(const CanonPath & parent) const;