Introduce CanonPath::fromFilename#15333
Merged
Ericson2314 merged 1 commit intomasterfrom Feb 25, 2026
Merged
Conversation
See docs for what it is. Use in DerivationBuilderImpl::writeBuilderFile and deletePath. Also adds O_DIRECTORY via openDirectory in deletePath. Co-authored-by: Sergei Zimmerman <sergei@zimmerman.foo>
xokdvium
commented
Feb 25, 2026
Comment on lines
+29
to
+30
| /* Use existing canonicalisation logic for CanonPath to check that the segment | ||
| is already a valid filename. */ |
Contributor
Author
There was a problem hiding this comment.
Seems to me that doing it this way is safer and has a lower chance of getting out of sync.
xokdvium
commented
Feb 25, 2026
| assert(parentDirPath != path); | ||
|
|
||
| AutoCloseFD dirfd = toDescriptor(open(path.parent_path().string().c_str(), O_RDONLY)); | ||
| AutoCloseFD dirfd = openDirectory(parentDirPath); |
Contributor
Author
There was a problem hiding this comment.
Here we can trivially get rid of the .string() churn already.
Ericson2314
approved these changes
Feb 25, 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 docs for what it is. Use in
DerivationBuilderImpl::writeBuilderFileanddeletePath. Also addsO_DIRECTORYviaopenDirectoryindeletePath.Context
Add 👍 to pull requests you find important.
The Nix maintainer team uses a GitHub project board to schedule and track reviews.