[Windows] Fix Symbolic Link Creation #2207
Merged
+14
−4
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
Contributor
gmittert
commented
May 1, 2019
gmittert
commented
- Don't error out if the target doesn't exist
- Check the correct path when determining if it's a directory
|
@swift-ci please test |
compnerd
reviewed
May 1, 2019
Foundation/FileManager+Win32.swift
Outdated
| var dwFlags: DWORD = DWORD(SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE) | ||
| var dwFlags = DWORD(SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE) | ||
| // destPath may not exist in which case we default to creating a file symlink | ||
| let faAttributes = (try? windowsFileAttributes(atPath: destPath)) ?? WIN32_FILE_ATTRIBUTE_DATA() |
There was a problem hiding this comment.
We need to resolve the final path here ... destPath needs to be resolved relative to path.
There was a problem hiding this comment.
Let's continue to throw here; we don't know what the target of the symlink will be and we can silently fail later with a symlink being a file symlink with a directory target.
Foundation/FileManager+Win32.swift
Outdated
| @@ -286,12 +287,12 @@ extension FileManager { | |||
| internal func _canonicalizedPath(toFileAtPath path: String) throws -> String { | |||
| var hFile: HANDLE = INVALID_HANDLE_VALUE | |||
| path.withCString(encodedAs: UTF16.self) { link in | |||
| hFile = CreateFileW(link, GENERIC_READ, DWORD(FILE_SHARE_WRITE), nil, DWORD(OPEN_EXISTING), DWORD(FILE_FLAG_BACKUP_SEMANTICS), nil) | |||
| hFile = CreateFileW(link, GENERIC_READ, DWORD(FILE_SHARE_READ | FILE_SHARE_WRITE), nil, DWORD(OPEN_EXISTING), DWORD(FILE_FLAG_BACKUP_SEMANTICS), nil) | |||
There was a problem hiding this comment.
- Please use
0instead ofGENERIC_READ - Please use
FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE - Please add a comment to explain the need for the
FILE_FLAG_BACKUP_SEMANTICShere.
|
@swift-ci please test and merge |
|
@swift-ci please test |
compnerd
approved these changes
May 3, 2019
Foundation/FileManager+Win32.swift
Outdated
| nil, | ||
| DWORD(OPEN_EXISTING), | ||
| // BACKUP_SEMANTICS are (confusingly) required | ||
| // in order to receive a handle to a directory |
There was a problem hiding this comment.
I would've put the comment before the CreateFileW call. BTW, Foundation doesn't do the one parameter per line for the arguments.
- Don't error out if the target doesn't exist - Check the correct path when determining if it's a directory
|
@swift-ci please test and merge |
1 similar comment
|
@swift-ci please test and merge |
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.