Strip \\?\ prefix from path generated by resolveSymlink #485
Conversation
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
|
@swift-ci Please test |
compnerd
approved these changes
Oct 10, 2024
Sources/TSCBasic/PathShims.swift
Outdated
| throw FileSystemError(.unknownOSError, path) | ||
| } | ||
| let path = String(decodingCString: $0.baseAddress!, as: UTF16.self) | ||
| // When using `VOLUME_NAME_DOS`, the returned path uses `\\?\`. | ||
| let path = String(decodingCString: $0.baseAddress!.advanced(by: 4), as: UTF16.self) |
There was a problem hiding this comment.
Do we want an assertion that the prefix is present?
There was a problem hiding this comment.
I was following what you did in swiftlang/swift-foundation#639. I guess we should also add the check there.
There was a problem hiding this comment.
Making the corresponding change to swift-foundation here: swiftlang/swift-foundation#974
This aligns the implementation of resolveSymlinks with that of Foundation.String._resolvingSymlinksInPath, which received this canonicalization fix in swiftlang/swift-foundation#639.
ahoppen
force-pushed
the
resolvesymlink
branch
from
80f5030 to
51f21e2
Compare
|
@swift-ci Please test |
ahoppen
added a commit
to ahoppen/swift-foundation
that referenced
this pull request
Oct 10, 2024
As far as I know `\\?\` is always returned by `GetFinalPathNameByHandleW` but it’s better to be safe and actually check instead of unconditionally trimming the first 4 characters from the returned path. See swiftlang/swift-tools-support-core#485 (comment)
|
@swift-ci Please test Windows |
ahoppen
added a commit
to ahoppen/swift-foundation
that referenced
this pull request
Oct 10, 2024
As far as I know `\\?\` is always returned by `GetFinalPathNameByHandleW` but it’s better to be safe and actually check instead of unconditionally trimming the first 4 characters from the returned path. See swiftlang/swift-tools-support-core#485 (comment)
ahoppen
added a commit
to ahoppen/swift-foundation
that referenced
this pull request
Oct 10, 2024
As far as I know `\\?\` is always returned by `GetFinalPathNameByHandleW` but it’s better to be safe and actually check instead of unconditionally trimming the first 4 characters from the returned path. See swiftlang/swift-tools-support-core#485 (comment)
|
@swift-ci Please test Windows |
jrflat
pushed a commit
to swiftlang/swift-foundation
that referenced
this pull request
Oct 11, 2024
As far as I know `\\?\` is always returned by `GetFinalPathNameByHandleW` but it’s better to be safe and actually check instead of unconditionally trimming the first 4 characters from the returned path. See swiftlang/swift-tools-support-core#485 (comment)
|
macOS CI failure is unrelated. This change only affects Windows. macOS CI is failing because this is the only repo that build SourceKit-LSP using a 5.9 host compiler, but SourceKit-LSP requires 5.10 to build successfully. We didn’t hit this before because this repo hasn’t seen any changes in the last 2 months, which is when SourceKit-LSP started requiring Swift 5.10. |
cthielen
pushed a commit
to cthielen/swift-foundation
that referenced
this pull request
Nov 8, 2024
…tlang#974) As far as I know `\\?\` is always returned by `GetFinalPathNameByHandleW` but it’s better to be safe and actually check instead of unconditionally trimming the first 4 characters from the returned path. See swiftlang/swift-tools-support-core#485 (comment)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This aligns the implementation of resolveSymlinks with that of Foundation.String._resolvingSymlinksInPath, which received this canonicalization fix in swiftlang/swift-foundation#639.