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

refactor(libstore/find-cycles): use portable std::filesystem and readFile APIs

Browse source 
Replaced POSIX-specific file operations with portable alternatives to
improve Windows compatibility.
This commit is contained in:
Bernardo Meurer Costa 2025-10-11 20:05:49 +00:00
parent 7eaa4991a4
commit ce70994454
No known key found for this signature in database
1 changed files with 9 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/libstore/build/find-cycles.cc
View file

@ -2,13 +2,8 @@
#include "nix/store/store-api.hh" #include "nix/store/store-api.hh"
#include "nix/util/file-system.hh" #include "nix/util/file-system.hh"
#include "nix/util/archive.hh"
#include <filesystem> #include <filesystem>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
namespace nix { namespace nix {
@ -85,31 +80,20 @@ void scanForCycleEdges(const Path & path, const StorePathSet & refs, StoreCycleE
*/ */
void scanForCycleEdges2(const std::string & path, CycleEdgeScanSink & sink) void scanForCycleEdges2(const std::string & path, CycleEdgeScanSink & sink)
{ {
auto st = lstat(path); auto fsPath = std::filesystem::path(path);
auto status = std::filesystem::symlink_status(fsPath);
debug("scanForCycleEdges2: scanning path = %s", path); debug("scanForCycleEdges2: scanning path = %s", path);
if (S_ISREG(st.st_mode)) { if (std::filesystem::is_regular_file(status)) {
// Handle regular files - stream contents into sink // Handle regular files - stream contents into sink
// The sink (RefScanSink) handles all hash detection and buffer management // The sink (RefScanSink) handles all hash detection and buffer management
sink.setCurrentPath(path); sink.setCurrentPath(path);
AutoCloseFD fd = open(path.c_str(), O_RDONLY | O_CLOEXEC); // Use Nix's portable readFile that streams into a sink
if (!fd) // This handles all file I/O portably across platforms
throw SysError("opening file '%1%'", path); readFile(path, sink);
} else if (std::filesystem::is_directory(status)) {
// Stream file contents into sink
// RefScanSink handles buffer boundaries automatically
std::vector<char> buf(65536);
size_t remaining = st.st_size;
while (remaining > 0) {
size_t toRead = std::min(remaining, buf.size());
readFull(fd.get(), buf.data(), toRead);
sink(std::string_view(buf.data(), toRead));
remaining -= toRead;
}
} else if (S_ISDIR(st.st_mode)) {
// Handle directories - recursively scan contents // Handle directories - recursively scan contents
std::map<std::string, std::string> unhacked; std::map<std::string, std::string> unhacked;
@ -138,9 +122,9 @@ void scanForCycleEdges2(const std::string & path, CycleEdgeScanSink & sink)
debug("scanForCycleEdges2: recursing into %s/%s", path, actualName); debug("scanForCycleEdges2: recursing into %s/%s", path, actualName);
scanForCycleEdges2(path + "/" + actualName, sink); scanForCycleEdges2(path + "/" + actualName, sink);
} }
} else if (S_ISLNK(st.st_mode)) { } else if (std::filesystem::is_symlink(status)) {
// Handle symlinks - stream link target into sink // Handle symlinks - stream link target into sink
std::string linkTarget = readLink(path); auto linkTarget = std::filesystem::read_symlink(fsPath).string();
debug("scanForCycleEdges2: scanning symlink %s -> %s", path, linkTarget); debug("scanForCycleEdges2: scanning symlink %s -> %s", path, linkTarget);