wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 19:01:16 +02:00
Code Activity

isInDir and isDirOrInDir: Clean up with std::filesystem

Browse source 
The behavior *does* change, per the tests, but I think the new behavior
is less buggy.
This commit is contained in:
John Ericson 2025-03-17 17:54:09 -04:00
parent 3286728e40
commit d3de22b2be
3 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/libutil-tests/file-system.cc
View file

@ -203,12 +203,10 @@ TEST(isInDir, notInDir)
ASSERT_EQ(p1, false); ASSERT_EQ(p1, false);
} }
// XXX: hm, bug or feature? :) Looking at the implementation
// this might be problematic.
TEST(isInDir, emptyDir) TEST(isInDir, emptyDir)
{ {
auto p1 = isInDir("/zes/foo/bar", ""); auto p1 = isInDir("/zes/foo/bar", "");
ASSERT_EQ(p1, true); ASSERT_EQ(p1, false);
} }
/* ---------------------------------------------------------------------------- /* ----------------------------------------------------------------------------
@ -233,14 +231,12 @@ TEST(isDirOrInDir, falseForDisjunctPaths)
TEST(isDirOrInDir, relativePaths) TEST(isDirOrInDir, relativePaths)
{ {
ASSERT_EQ(isDirOrInDir("/foo/..", "/foo"), true); ASSERT_EQ(isDirOrInDir("/foo/..", "/foo"), false);
} }
// XXX: while it is possible to use "." or ".." in the TEST(isDirOrInDir, relativePathsTwice)
// first argument this doesn't seem to work in the second.
TEST(isDirOrInDir, DISABLED_shouldWork)
{ {
ASSERT_EQ(isDirOrInDir("/foo/..", "/foo/."), true); ASSERT_EQ(isDirOrInDir("/foo/..", "/foo/."), false);
} }
/* ---------------------------------------------------------------------------- /* ----------------------------------------------------------------------------

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

@ -149,16 +149,18 @@ std::string_view baseNameOf(std::string_view path)
} }
bool isInDir(std::string_view path, std::string_view dir) bool isInDir(const fs::path & path, const fs::path & dir)
{ {
return path.substr(0, 1) == "/" /* Note that while the standard doesn't guarantee this, the
&& path.substr(0, dir.size()) == dir `lexically_*` functions should do no IO and not throw. */
&& path.size() >= dir.size() + 2 auto rel = path.lexically_relative(dir);
&& path[dir.size()] == '/'; /* Method from
https://stackoverflow.com/questions/62503197/check-if-path-contains-another-in-c++ */
return !rel.empty() && rel.native()[0] != OS_STR('.');
} }
bool isDirOrInDir(std::string_view path, std::string_view dir) bool isDirOrInDir(const fs::path & path, const fs::path & dir)
{ {
return path == dir || isInDir(path, dir); return path == dir || isInDir(path, dir);
} }

4
src/libutil/file-system.hh
View file

@ -105,13 +105,13 @@ std::string_view baseNameOf(std::string_view path);
* Check whether 'path' is a descendant of 'dir'. Both paths must be * Check whether 'path' is a descendant of 'dir'. Both paths must be
* canonicalized. * canonicalized.
*/ */
bool isInDir(std::string_view path, std::string_view dir); bool isInDir(const std::filesystem::path & path, const std::filesystem::path & dir);
/** /**
* Check whether 'path' is equal to 'dir' or a descendant of * Check whether 'path' is equal to 'dir' or a descendant of
* 'dir'. Both paths must be canonicalized. * 'dir'. Both paths must be canonicalized.
*/ */
bool isDirOrInDir(std::string_view path, std::string_view dir); bool isDirOrInDir(const std::filesystem::path & path, const std::filesystem::path & dir);
/** /**
* Get status of `path`. * Get status of `path`.