Skip to content

Foundation: support long file paths for FileHandle on Windows #4768

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 18, 2023
Merged

Foundation: support long file paths for FileHandle on Windows #4768

Show file tree
Hide file tree
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: 5 additions & 5 deletions Sources/Foundation/FileHandle.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,12 +432,12 @@ open class FileHandle : NSObject {
}

internal convenience init?(path: String, flags: Int32, createMode: Int) {
guard let fd: Int32 = try? FileManager.default._fileSystemRepresentation(withPath: path, {
_CFOpenFileWithMode($0, flags, mode_t(createMode))
}), fd > 0 else { return nil }
guard let fd: CInt = try? withNTPathRepresentation(of: path, {
_CFOpenFileWithMode($0, flags, mode_t(createMode))
}), fd > 0 else { return nil }

self.init(fileDescriptor: fd, closeOnDealloc: true)
if self._handle == INVALID_HANDLE_VALUE { return nil }
self.init(fileDescriptor: fd, closeOnDealloc: true)
if self._handle == INVALID_HANDLE_VALUE { return nil }
}
#else
public init(fileDescriptor fd: Int32, closeOnDealloc closeopt: Bool) {
Expand Down
5 changes: 4 additions & 1 deletion Sources/Foundation/FileManager+Win32.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ extension URL {
}


private func withNTPathRepresentation<Result>(of path: String, _ body: (UnsafePointer<WCHAR>) throws -> Result) throws -> Result {
internal func withNTPathRepresentation<Result>(of path: String, _ body: (UnsafePointer<WCHAR>) throws -> Result) throws -> Result {
guard !path.isEmpty else {
throw CocoaError.error(.fileReadInvalidFileName, userInfo: [NSFilePathErrorKey:path])
}
Expand Down Expand Up @@ -72,6 +72,9 @@ private func withNTPathRepresentation<Result>(of path: String, _ body: (UnsafePo
_ = GetFullPathNameW(pwszPath, DWORD($0.count), $0.baseAddress, nil)
return String(decodingCString: $0.baseAddress!, as: UTF16.self)
}
guard !path.hasPrefix(#"\\"#) else {
return try path.withCString(encodedAs: UTF16.self, body)
}
return try #"\\?\\#(path)"#.withCString(encodedAs: UTF16.self, body)
}
}
Expand Down