• Use copyfile (with COPYFILE_CLONE_FORCE) when possible on macOS to clone the file while still keeping file locking logic intact
• Split common Unix logic into multiple functions that the macOS implementation uses parts of at different times
• Add string version of ResolveLinkTarget to save the allocation since part of the code needs it
• Need to add tests to check the file is actually cloned so we know if it works or not

• I missed setting StringMarshalling on the LibraryImport
• I missed partial on the CopyFile method implementations

• Apparently 'Both partial method declarations must be unsafe or neither may be unsafe'

• I love partial methods
• Move unsafe keyword into the OSX method rather than in method declaration
• Fix accessibility modifier of CopyFile in FileSystem.Unix.cs

• Fix indentation (should have used spaces)
• Import Microsoft.Win32.SafeHandles in FileSystem.CopyFile.OSX.cs file
• Fix for SA1205 'Partial elements should declare an access modifier'
• Fix typo in FileSystem.CopyFile.OtherUnix.cs of 'startedCopyFile'
• Fix missing openDst parameter code in StartCopyFile
• Fix not checking the nullability in StandardCopyFile, which led to 'Possible null reference argument for parameter'

• Add missing parameter value (openNewFile) to OpenCopyFileDstHandle
• Fix misnamed variable usages throughout some code
• Properly qualify Interop.ErrorInfo
• This should be the last fix for build issues for this set

• Add missing nullable ? for dstHandle (which obtains the file lock)

• Test failures were since copying a file onto itself should cause an error, this fixes that

• Fix nullability issues

…ain)

• The variable in the if statements weren't updated
• Handling for if readlink fails

…t#77835'

• The source path should have used sourceFullPath rather than destPath

Merge remote-tracking branch 'upstream'

• From dotnet#33159
• As requested by feedback
• I assumed this test already existed, so it's good we have it now

• Add a space after //

• Use clonefile API instead
• Update OpenReadOnly API to return the whole FileStatus
• Revert changes to ResolveLinkTarget
• Incorporate some feedback about how CopyFile should be implemented
- Use st_dev and st_ino to optimise checks
- Read them from an already required fstat call
- Avoid calling clonefile when it would be likely to fail
- Avoid expensive destination file locking scheme when clonefile won't be called
- Fail fast when copying file onto itself

• When using clonefile, specify CLONE_ACL to ensure ACLs are cloned, matching previous behaviour
• Make CopyOntoLockedFile test conditional to platforms that support file locking

• Remove retry logic after feedback that it is not necessary

Simplify error throwing, rename readStatus to isReadOnly, prepare for removal of StartedCopyFileState type.

Co-authored-by: Stephen Toub <[email protected]>

Squashed 19 commits, which addressed most of Stephen Toub's feedback. Thanks GH for all of those separate commits :)

• Add missing filePermissions field to return of StartCopyFile (which I removed because I didn't see it being used anywhere, but of course I didn't search for it)

• Implement feedback to remove StandardCopyFile, and to remove StartCopyFile
• Add new line before CLONE_ACL line

• Missed line in FileSystem.CopyFile.OSX.cs referencing the now-removed StandardCopyFile

…CopyFile.OSX.cs

Co-authored-by: Stephen Toub <[email protected]>

…CopyFile.OSX.cs

Co-authored-by: Stephen Toub <[email protected]>

…CopyFile.OSX.cs

Co-authored-by: Stephen Toub <[email protected]>

…CopyFile.OSX.cs

Co-authored-by: Stephen Toub <[email protected]>

• Explain more clearly why we open a lock to the destination file before deleting it

• Remove comments saying to keep code in sync as per feedback

• Update some comments to make things clear
• Shorten comment and code that interprets the error as per feedback

• Implement suggestion from @tmds that greatly cuts down on code duplication :)

• This time in FileSystem.TryCloneFile.OSX.cs

• We can get EINVAL resulting from trying to copy ACLs, so we retry with with the flag to copy ACLs disabled (up to 1 time)

• Let me know if I should add these comments back

…TryCloneFile.OSX.cs

Co-authored-by: Dan Moseley <[email protected]>

• As per feedback. It allows us to avoid the gotos.
• Also reorder the check on the second retry.

• Since it should only happen for an invalid filesystem anyway

• Implement feedback to use partial functions so that TryCloneFile doesn't have to exist other than when it's actually needed