Wrap more filesystem calls with fileSystemRepresentation() #1994
Conversation
This file contains 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 test |
|
cc @compnerd |
compnerd
reviewed
Mar 12, 2019
Foundation/FileManager.swift
Outdated
| @@ -1450,7 +1450,7 @@ open class FileManager : NSObject { | |||
| #if os(Windows) | |||
| NSUnimplemented() | |||
| #else | |||
| if rmdir(path) == 0 { | |||
| if _fileSystemRepresentation(withPath: path, { rmdir($0) }) == 0 { | |||
There was a problem hiding this comment.
I think that it would be better to wrap the path conversion at the _removeItem call site.
| @@ -752,8 +752,10 @@ extension FileHandle { | |||
| } | |||
|
|
|||
| internal static func _openFileDescriptorForURL(_ url : URL, flags: Int32, reading: Bool) throws -> Int32 { | |||
There was a problem hiding this comment.
Again, I think its better to wrap this at the public API side where the call to _openFileDescriptorURL is made.
There was a problem hiding this comment.
The advantage of doing it here is you dont need to fix up every caller or any new callers.
Also the type for the file system representaion is not a URL or String so it would change the method signature.
- FileManager._removeItem() and FileHandle._openFileDescriptorForURL() now wrap the system calls with _fileSystemRepresentation(withPath:)
|
@swift-ci test |
|
@swift-ci 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.
No description provided.