[Windows] Fix FileManager.removeItem #2203
Merged
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
- Get the fsr of the passed in path before using it
- Add the correct path to the directory stack
|
@swift-ci please test |
compnerd
reviewed
May 1, 2019
Foundation/FileManager+Win32.swift
Outdated
| @@ -405,30 +405,37 @@ extension FileManager { | |||
| guard alreadyConfirmed || shouldRemoveItemAtPath(path, isURL: isURL) else { | |||
| return | |||
| } | |||
| let faAttributes = try windowsFileAttributes(atPath: path) | |||
| let url = URL(fileURLWithPath: path) | |||
| var fsrBuf: UnsafeMutableBufferPointer<WCHAR> = UnsafeMutableBufferPointer.allocate(capacity: path.length * 2) | |||
There was a problem hiding this comment.
Sounds good! Done.
|
@swift-ci please test |
1 similar comment
|
@swift-ci please test |
compnerd
approved these changes
May 1, 2019
Foundation/FileManager+Win32.swift
Outdated
| let url = URL(fileURLWithPath: path) | ||
| var fsrBuf: [WCHAR] = Array<WCHAR>(repeating: 0, count: Int(MAX_PATH)) | ||
| _CFURLGetWideFileSystemRepresentation(url._cfObject, false, &fsrBuf, Int(MAX_PATH)) | ||
| let length = fsrBuf.firstIndex(where: {$0 == 0}) ?? (path.length * 2) |
There was a problem hiding this comment.
This is probably better written as:
let length = wcslen_s(&path, fsrBuf.count)
- Get the fsr of the passed in path before using it - Add the correct path to the directory stack
|
@swift-ci please test and merge |
1 similar comment
|
@swift-ci please test and merge |
|
@swift-ci please test linux platform |
|
@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.