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

replace all instances of std::filesystem::directory_iterator with DirectoryIterator

Browse source 
(cherry picked from commit 1c4496f4e5)
This commit is contained in:
Jörg Thalheim 2025-05-01 09:54:14 +02:00
parent 0f4b17e51f
commit 3d8d19928e
16 changed files with 55 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -385,7 +385,7 @@ void recursiveSync(const Path & path)
while (!dirsToEnumerate.empty()) {
auto currentDir = dirsToEnumerate.back();
dirsToEnumerate.pop_back();
for (auto & entry : std::filesystem::directory_iterator(currentDir)) {
for (auto & entry : DirectoryIterator(currentDir)) {
auto st = entry.symlink_status();
if (fs::is_directory(st)) {
dirsToEnumerate.emplace_back(entry.path());
@ -689,7 +689,7 @@ void copyFile(const fs::path & from, const fs::path & to, bool andDelete)
fs::copy(from, to, fs::copy_options::copy_symlinks | fs::copy_options::overwrite_existing);
} else if (fs::is_directory(fromStatus)) {
fs::create_directory(to);
for (auto & entry : fs::directory_iterator(from)) {
for (auto & entry : DirectoryIterator(from)) {
copyFile(entry, to / entry.path().filename(), andDelete);
}
} else {