(128078378) FoundationEssentials: correct error handling for item removal (#610)

compnerd · web-flow · commit d1ace948b5cb · 2024-05-14T13:40:54.000-07:00
The condition of the error check was inverted as it was meant to be a
`guard` statement. This was resulting in an infinite loop. With this we
now pass a few additional tests and the test suite no longer hangs.
diff --git a/Sources/FoundationEssentials/FileManager/FileOperations.swift b/Sources/FoundationEssentials/FileManager/FileOperations.swift
@@ -358,11 +358,12 @@ enum _FileOperations {
             try directory.withNTPathRepresentation {
                 if RemoveDirectoryW($0) { return }
                 let dwError: DWORD = GetLastError()
-                if dwError == ERROR_DIR_NOT_EMPTY {
+                guard dwError == ERROR_DIR_NOT_EMPTY else {
                     let error = CocoaError.removeFileError(dwError, directory)
                     guard (filemanager?._shouldProceedAfter(error: error, removingItemAtPath: directory) ?? false) else {
                         throw error
                     }
+                    return
                 }
                 stack.append(directory)
 

Original file line number	Diff line number	Diff line change
`@@ -358,11 +358,12 @@ enum _FileOperations {`
`358`	`358`	`try directory.withNTPathRepresentation {`
`359`	`359`	`if RemoveDirectoryW($0) { return }`
`360`	`360`	`let dwError: DWORD = GetLastError()`
`361`		`- if dwError == ERROR_DIR_NOT_EMPTY {`
	`361`	`+ guard dwError == ERROR_DIR_NOT_EMPTY else {`
`362`	`362`	`let error = CocoaError.removeFileError(dwError, directory)`
`363`	`363`	`guard (filemanager?._shouldProceedAfter(error: error, removingItemAtPath: directory) ?? false) else {`
`364`	`364`	`throw error`
`365`	`365`	`}`
	`366`	`+ return`
`366`	`367`	`}`
`367`	`368`	`stack.append(directory)`
`368`	`369`