Skip to content

Fix up _contentsOfDir on Windows #2328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 12, 2019
Merged

Fix up _contentsOfDir on Windows #2328

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions Foundation/FileManager+Win32.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,10 @@ extension FileManager {
}

internal func _contentsOfDir(atPath path: String, _ closure: (String, Int32) throws -> () ) throws {
try path.withCString(encodedAs: UTF16.self) {
guard path != "" else {
throw NSError(domain: NSCocoaErrorDomain, code: CocoaError.fileReadInvalidFileName.rawValue, userInfo: [NSFilePathErrorKey : NSString(path)])
}
try (path + "\\*").withCString(encodedAs: UTF16.self) {
var ffd: WIN32_FIND_DATAW = WIN32_FIND_DATAW()

let hDirectory: HANDLE = FindFirstFileW($0, &ffd)
Expand All @@ -204,8 +207,9 @@ extension FileManager {
String(decodingCString: $0, as: UTF16.self)
}
}

try closure(path, Int32(ffd.dwFileAttributes))
if path != "." && path != ".." {
try closure(path, Int32(ffd.dwFileAttributes))
}
} while FindNextFileW(hDirectory, &ffd)
}
}
Expand Down