Misc file system fixes, especially for windows#15301
Merged
Ericson2314 merged 7 commits intoNixOS:masterfrom Feb 20, 2026
Merged
Misc file system fixes, especially for windows#15301Ericson2314 merged 7 commits intoNixOS:masterfrom
Ericson2314 merged 7 commits intoNixOS:masterfrom
Conversation
Add FS_ROOT_NO_TRAILING_SLASH macro and update isInDir and isDirOrInDir tests to use FS_ROOT and FS_SEP macros for cross-platform compatibility.
It doesn't do anything on Windows, it appears.
Make sure we're testing non-directory roots.
This indicates that they are returning an owned handle (i.e. the caller should --- and will, thanks to RAII --- close it). `ntOpenAt` and friends (internal) also use `AutoCloseFD` for the same reason.
`AutoCloseFD::fsync()` contained platform-specific logic behind CPP guards. This extracts it into a free function `syncDescriptor(Descriptor)` with separate Unix and Windows implementations, and makes `AutoCloseFD::fsync()` an inline wrapper that delegates to it. The Windows implementation uses `FlushFileBuffers` (returns `BOOL`, true on success) while Unix uses `::fsync` (or `F_FULLFSYNC` on macOS), so splitting them avoids conflating the two calling conventions.
The new signature is: writeFile(Descriptor fd, std::string_view s, FsSync sync = FsSync::No, const Path * origPath = nullptr) This uses `descriptorToPath` if `origPath` is not provided.
Ericson2314
changed the title
Ericson2314
approved these changes
Feb 20, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Motivation
See each individual commit for details
Add 👍 to pull requests you find important.
The Nix maintainer team uses a GitHub project board to schedule and track reviews.