Skip to content

Fix divergent overwrite behavior of FileManager.copyItem(at:to:) on Linux and Windows #4821

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 2 commits into from
Sep 16, 2023
Merged

Fix divergent overwrite behavior of FileManager.copyItem(at:to:) on Linux and Windows #4821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6aa0ee4
Fix silent-overwrite behavior of FileManager.copyItem() on Linux
gwynne Sep 16, 2023
cfb9ad1
Fix silent-overwrite behavior of FileManager.copyItem() on Windows
gwynne Sep 16, 2023
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
2 changes: 1 addition & 1 deletion Sources/Foundation/FileManager+POSIX.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@ extension FileManager {
}
defer { close(srcfd) }

let dstfd = open(dstRep, O_WRONLY | O_CREAT | O_TRUNC, 0o666)
let dstfd = open(dstRep, O_WRONLY | O_CREAT | O_EXCL | O_TRUNC, 0o666)
guard dstfd >= 0 else {
throw _NSErrorWithErrno(errno, reading: false, path: dstPath,
extraUserInfo: extraErrorInfo(srcPath: srcPath, dstPath: dstPath, userVariant: variant))
Expand Down
2 changes: 1 addition & 1 deletion Sources/Foundation/FileManager+Win32.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ extension FileManager {
internal func _copyRegularFile(atPath srcPath: String, toPath dstPath: String, variant: String = "Copy") throws {
try withNTPathRepresentation(of: srcPath) { wszSource in
try withNTPathRepresentation(of: dstPath) { wszDestination in
if !CopyFileW(wszSource, wszDestination, false) {
if !CopyFileW(wszSource, wszDestination, true) {
throw _NSErrorWithWindowsError(GetLastError(), reading: true, paths: [srcPath, dstPath])
}
}
Expand Down