Add extra logging

Author: jmschonfeld

Sources/Foundation/FileHandle.swift

@@ -826,7 +826,8 @@ extension FileHandle {
             return _CFOpenFile(fsRep, flags)
         })
         if fd < 0 {
-            throw _NSErrorWithErrno(errno, reading: reading, url: url)
+            print("_openFileDescriptorForURL(\(url), flags: \(flags), reading: \(reading)) Failed: \(fd)")
+            throw _NSErrorWithErrno(errno, reading: reading, url: url, extraUserInfo: [NSLocalizedFailureReasonErrorKey:"_openFileDescriptorForURL(\(url), flags: \(flags), reading: \(reading)) Failed: \(fd)"])
         }
         return fd
     }

Sources/Foundation/FoundationErrors.swift

@@ -211,7 +211,7 @@ internal func _NSErrorWithErrno(_ posixErrno : Int32, reading : Bool, path : Str
 // https://docs.microsoft.com/en-us/windows/desktop/Debug/system-error-codes
 internal let _NSWindowsErrorDomain = "org.swift.Foundation.WindowsError"
 
-internal func _NSErrorWithWindowsError(_ windowsError: DWORD, reading: Bool, paths: [String]? = nil) -> NSError {
+internal func _NSErrorWithWindowsError(_ windowsError: DWORD, reading: Bool, paths: [String]? = nil, extraUserInfo: [String : Any] = [:]) -> NSError {
     var cocoaError : CocoaError.Code
     switch windowsError {
         case DWORD(ERROR_LOCK_VIOLATION): cocoaError = .fileLocking
@@ -269,9 +269,10 @@ internal func _NSErrorWithWindowsError(_ windowsError: DWORD, reading: Bool, pat
                 }
             }
         }
+    
+    var info = extraUserInfo
+    info[NSUnderlyingErrorKey] = NSError(domain: _NSWindowsErrorDomain, code: Int(windowsError))
 
-    return NSError(domain: NSCocoaErrorDomain, code: cocoaError.rawValue, userInfo: [
-            NSUnderlyingErrorKey: NSError(domain: _NSWindowsErrorDomain, code: Int(windowsError))
-    ])
+    return NSError(domain: NSCocoaErrorDomain, code: cocoaError.rawValue, userInfo: info)
 }
 #endif

Sources/Foundation/Process.swift

@@ -517,18 +517,18 @@ open class Process: NSObject {
         var modifiedPipes: [(handle: HANDLE, prevValue: DWORD)] = []
         defer { modifiedPipes.forEach { SetHandleInformation($0.handle, DWORD(HANDLE_FLAG_INHERIT), $0.prevValue) } }
 
-        func deferReset(handle: HANDLE) throws {
+        func deferReset(handle: HANDLE, description: String) throws {
             var handleInfo: DWORD = 0
             guard GetHandleInformation(handle, &handleInfo) else {
-                throw _NSErrorWithWindowsError(GetLastError(), reading: false)
+                throw _NSErrorWithWindowsError(GetLastError(), reading: false, extraUserInfo: [NSLocalizedFailureReasonErrorKey:"deferReset(\(handle), \(description)): GetHandleInformation failed"])
             }
             modifiedPipes.append((handle: handle, prevValue: handleInfo & DWORD(HANDLE_FLAG_INHERIT)))
         }
 
         switch standardInput {
         case let pipe as Pipe:
             siStartupInfo.hStdInput = pipe.fileHandleForReading._handle
-            try deferReset(handle: pipe.fileHandleForWriting._handle)
+            try deferReset(handle: pipe.fileHandleForWriting._handle, description: "standardInput as Pipe .fileHandleForReading")
             SetHandleInformation(pipe.fileHandleForWriting._handle, DWORD(HANDLE_FLAG_INHERIT), 0)
 
         // nil or NullDevice maps to NUL
@@ -538,15 +538,15 @@ open class Process: NSObject {
 
         case let handle as FileHandle:
             siStartupInfo.hStdInput = handle._handle
-            try deferReset(handle: handle._handle)
+            try deferReset(handle: handle._handle, description: "standardInput as FileHandle")
             SetHandleInformation(handle._handle, DWORD(HANDLE_FLAG_INHERIT), 1)
         default: break
         }
 
         switch standardOutput {
         case let pipe as Pipe:
             siStartupInfo.hStdOutput = pipe.fileHandleForWriting._handle
-            try deferReset(handle: pipe.fileHandleForReading._handle)
+            try deferReset(handle: pipe.fileHandleForReading._handle, description: "standardOutput as Pipe .fileHandleForReading")
             SetHandleInformation(pipe.fileHandleForReading._handle, DWORD(HANDLE_FLAG_INHERIT), 0)
 
         // nil or NullDevice maps to NUL
@@ -556,15 +556,15 @@ open class Process: NSObject {
 
         case let handle as FileHandle:
             siStartupInfo.hStdOutput = handle._handle
-            try deferReset(handle: handle._handle)
+            try deferReset(handle: handle._handle, description: "standardOutput as FileHandle")
             SetHandleInformation(handle._handle, DWORD(HANDLE_FLAG_INHERIT), 1)
         default: break
         }
 
         switch standardError {
         case let pipe as Pipe:
             siStartupInfo.hStdError = pipe.fileHandleForWriting._handle
-            try deferReset(handle: pipe.fileHandleForReading._handle)
+            try deferReset(handle: pipe.fileHandleForReading._handle, description: "standardError as Pipe .fileHandleForReading")
             SetHandleInformation(pipe.fileHandleForReading._handle, DWORD(HANDLE_FLAG_INHERIT), 0)
 
         // nil or NullDevice maps to NUL
@@ -574,7 +574,7 @@ open class Process: NSObject {
 
         case let handle as FileHandle:
             siStartupInfo.hStdError = handle._handle
-            try deferReset(handle: handle._handle)
+            try deferReset(handle: handle._handle, description: "standardError as FileHandle")
             SetHandleInformation(handle._handle, DWORD(HANDLE_FLAG_INHERIT), 1)
         default: break
         }
@@ -674,9 +674,9 @@ open class Process: NSObject {
                 // ENOENT, we intercept the error to match the POSIX
                 // behaviour
                 if error == ERROR_DIRECTORY {
-                    throw _NSErrorWithWindowsError(DWORD(ERROR_FILE_NOT_FOUND), reading: true)
+                    throw _NSErrorWithWindowsError(DWORD(ERROR_FILE_NOT_FOUND), reading: true, extraUserInfo: [NSLocalizedFailureReasonErrorKey:"CreateProcessW(nil, \(quoteWindowsCommandLine(command)), nil, nil, true, CREATE_UNICODE_ENVIRONMENT, \(szEnvironment), \(workingDirectory), <ptr>, <ptr>) failed with \(error)"])
                 }
-                throw _NSErrorWithWindowsError(GetLastError(), reading: true)
+                  throw _NSErrorWithWindowsError(GetLastError(), reading: true, extraUserInfo: [NSLocalizedFailureReasonErrorKey:"CreateProcessW(nil, \(quoteWindowsCommandLine(command)), nil, nil, true, CREATE_UNICODE_ENVIRONMENT, \(szEnvironment), \(workingDirectory), <ptr>, <ptr>) failed with \(error)"])
               }
             }
           }