rdar://138657153 (Writing NSData atomically defaults to using noFileProtection (class D)) (#1223)

kperryua · web-flow · commit 3179457ef5a0 · 2025-03-21T15:13:46.000-07:00
diff --git a/Sources/FoundationEssentials/Data/Data+Writing.swift b/Sources/FoundationEssentials/Data/Data+Writing.swift
@@ -226,12 +226,14 @@ private func createProtectedTemporaryFile(at destinationPath: String, inPath: Pa
             }
         }
         
+        let updatedOptions = _NSDataWritingOptionsForRelocatedAtomicWrite(options, destinationPath)
+        
         let auxFile = temporaryDirectoryPath.appendingPathComponent(destinationPath.lastPathComponent)
         return try auxFile.withFileSystemRepresentation { auxFileFileSystemRep in
             guard let auxFileFileSystemRep else {
                 throw CocoaError(.fileWriteInvalidFileName)
             }
-            let fd = openFileDescriptorProtected(path: auxFileFileSystemRep, flags: O_CREAT | O_EXCL | O_RDWR, options: options)
+            let fd = openFileDescriptorProtected(path: auxFileFileSystemRep, flags: O_CREAT | O_EXCL | O_RDWR, options: updatedOptions)
             if fd >= 0 {
                 return (fd, auxFile, temporaryDirectoryPath)
             } else {

Original file line number	Diff line number	Diff line change
`@@ -226,12 +226,14 @@ private func createProtectedTemporaryFile(at destinationPath: String, inPath: Pa`
`226`	`226`	`}`
`227`	`227`	`}`
`228`	`228`
	`229`	`+ let updatedOptions = _NSDataWritingOptionsForRelocatedAtomicWrite(options, destinationPath)`
	`230`	`+`
`229`	`231`	`let auxFile = temporaryDirectoryPath.appendingPathComponent(destinationPath.lastPathComponent)`
`230`	`232`	`return try auxFile.withFileSystemRepresentation { auxFileFileSystemRep in`
`231`	`233`	`guard let auxFileFileSystemRep else {`
`232`	`234`	`throw CocoaError(.fileWriteInvalidFileName)`
`233`	`235`	`}`
`234`		`- let fd = openFileDescriptorProtected(path: auxFileFileSystemRep, flags: O_CREAT \| O_EXCL \| O_RDWR, options: options)`
	`236`	`+ let fd = openFileDescriptorProtected(path: auxFileFileSystemRep, flags: O_CREAT \| O_EXCL \| O_RDWR, options: updatedOptions)`
`235`	`237`	`if fd >= 0 {`
`236`	`238`	`return (fd, auxFile, temporaryDirectoryPath)`
`237`	`239`	`} else {`