Skip to content

FoundationEssentials: correct directory enumeration on Windows #629

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
May 22, 2024
Merged

FoundationEssentials: correct directory enumeration on Windows #629

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
4 changes: 4 additions & 0 deletions Sources/FoundationEssentials/FileManager/FileOperations+Enumeration.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ struct _Win32DirectoryContentsSequence: Sequence {
}

private var hFind: HANDLE?
private var bValid: Bool = true
private var ffdData: WIN32_FIND_DATAW = .init()
private var prefix: String = ""
private var slash: Bool
Expand Down Expand Up @@ -69,6 +70,7 @@ struct _Win32DirectoryContentsSequence: Sequence {

func next() -> Element? {
guard let hFind else { return nil }
guard bValid else { return nil }
repeat {
let name = withUnsafeBytes(of: ffdData.cFileName) {
String(decodingCString: $0.baseAddress!.assumingMemoryBound(to: WCHAR.self), as: UTF16.self)
Expand All @@ -80,8 +82,10 @@ struct _Win32DirectoryContentsSequence: Sequence {

let prefixed: String =
prefix + name + ((slash && ffdData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY == FILE_ATTRIBUTE_DIRECTORY) ? #"\"# : "")
defer { bValid = FindNextFileW(hFind, &ffdData) }
return Element(fileName: name, fileNameWithPrefix: prefixed, dwFileAttributes: ffdData.dwFileAttributes)
} while FindNextFileW(hFind, &ffdData)
bValid = false
return nil
}
}
Expand Down