Implement _lstatFile on Windows #2015
Merged
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
compnerd
reviewed
Mar 18, 2019
Foundation/FileManager.swift
Outdated
| @@ -1818,19 +1817,70 @@ open class FileManager : NSObject { | |||
| } | |||
|
|
|||
| var statInfo = stat() | |||
| #if os(Windows) | |||
| let h = path.withCString(encodedAs: UTF16.self) { | |||
| CreateFileW( /*lpFileName=*/$0, | |||
Foundation/FileManager.swift
Outdated
| if err == ERROR_FILE_NOT_FOUND { | ||
| errno = ENOENT | ||
| } | ||
| throw _NSErrorWithErrno(errno, reading: true, path: path) |
There was a problem hiding this comment.
Just replace this with _NSErrorWithWindowsError
Foundation/FileManager.swift
Outdated
| // themselves, we say symlinks are regular files | ||
| UInt16((info.dwFileAttributes & DWORD(FILE_ATTRIBUTE_REPARSE_POINT)) != 0 | ||
| ? _S_IFREG | ||
| : (info.dwFileAttributes & DWORD(FILE_ATTRIBUTE_DIRECTORY)) != 0 |
There was a problem hiding this comment.
Can you extract the checks into variables please, it makes it easier to read.
Windows doesn't have lstat, but it still can be implemented. This should help remove some of the Windows specific codepaths.
gmittert
force-pushed
the
DontFollowSketchyLinks
branch
from
f419d5a to
a62b609
Compare
|
@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.
Windows doesn't have lstat, but it still can be implemented. This should
help remove some of the Windows specific codepaths.
This is based off the lstat in llbuild
Also depends on swiftlang/swift#23342