WIP: Fixing review comments

Author: iCharlesHu

Sources/FoundationEssentials/Subprocess/Platforms/Subprocess+Darwin.swift

@@ -49,11 +49,14 @@ extension Subprocess.Configuration {
         defer {
             posix_spawn_file_actions_destroy(&fileActions)
         }
-
-        var result = posix_spawn_file_actions_adddup2(&fileActions, input.getReadFileDescriptor().rawValue, 0)
-        guard result == 0 else {
-            try self.cleanupAll(input: input, output: output, error: error)
-            throw POSIXError(.init(rawValue: result) ?? .ENODEV)
+        // Input
+        var result: Int32 = -1
+        if let inputRead = input.getReadFileDescriptor() {
+            result = posix_spawn_file_actions_adddup2(&fileActions, inputRead.rawValue, 0)
+            guard result == 0 else {
+                try self.cleanupAll(input: input, output: output, error: error)
+                throw POSIXError(.init(rawValue: result) ?? .ENODEV)
+            }
         }
         if let inputWrite = input.getWriteFileDescriptor() {
             // Close parent side
@@ -63,10 +66,13 @@ extension Subprocess.Configuration {
                 throw POSIXError(.init(rawValue: result) ?? .ENODEV)
             }
         }
-        result = posix_spawn_file_actions_adddup2(&fileActions, output.getWriteFileDescriptor().rawValue, 1)
-        guard result == 0 else {
-            try self.cleanupAll(input: input, output: output, error: error)
-            throw POSIXError(.init(rawValue: result) ?? .ENODEV)
+        // Output
+        if let outputWrite = output.getWriteFileDescriptor() {
+            result = posix_spawn_file_actions_adddup2(&fileActions, outputWrite.rawValue, 1)
+            guard result == 0 else {
+                try self.cleanupAll(input: input, output: output, error: error)
+                throw POSIXError(.init(rawValue: result) ?? .ENODEV)
+            }
         }
         if let outputRead = output.getReadFileDescriptor() {
             // Close parent side
@@ -76,10 +82,13 @@ extension Subprocess.Configuration {
                 throw POSIXError(.init(rawValue: result) ?? .ENODEV)
             }
         }
-        result = posix_spawn_file_actions_adddup2(&fileActions, error.getWriteFileDescriptor().rawValue, 2)
-        guard result == 0 else {
-            try self.cleanupAll(input: input, output: output, error: error)
-            throw POSIXError(.init(rawValue: result) ?? .ENODEV)
+        // Error
+        if let errorWrite = error.getWriteFileDescriptor() {
+            result = posix_spawn_file_actions_adddup2(&fileActions, errorWrite.rawValue, 2)
+            guard result == 0 else {
+                try self.cleanupAll(input: input, output: output, error: error)
+                throw POSIXError(.init(rawValue: result) ?? .ENODEV)
+            }
         }
         if let errorRead = error.getReadFileDescriptor() {
             // Close parent side

Sources/FoundationEssentials/Subprocess/Subprocess+API.swift

@@ -32,10 +32,11 @@ extension Subprocess {
             output: .init(method: output.method),
             error: .init(method: error.method)
         ) { subprocess in
+            let (standardOutput, standardError) = try await subprocess.captureIOs()
             return (
                 processIdentifier: subprocess.processIdentifier,
-                standardOutput: try subprocess.captureStandardOutput(),
-                standardError: try subprocess.captureStandardError()
+                standardOutput: standardOutput,
+                standardError: standardError
             )
         }
         return CollectedResult(
@@ -64,13 +65,14 @@ extension Subprocess {
             platformOptions: platformOptions,
             output: .init(method: output.method),
             error: .init(method: output.method)
-        ) { execution, writer in
+        ) { subprocess, writer in
             try await writer.write(input)
             try await writer.finish()
+            let (standardOutput, standardError) = try await subprocess.captureIOs()
             return (
-                processIdentifier: execution.processIdentifier,
-                standardOutput: try execution.captureStandardOutput(),
-                standardError: try execution.captureStandardError()
+                processIdentifier: subprocess.processIdentifier,
+                standardOutput: standardOutput,
+                standardError: standardError
             )
         }
         return CollectedResult(
@@ -99,13 +101,14 @@ extension Subprocess {
             platformOptions: platformOptions,
             output: .init(method: output.method),
             error: .init(method: output.method)
-        ) { execution, writer in
+        ) { subprocess, writer in
             try await writer.write(input)
             try await writer.finish()
+            let (standardOutput, standardError) = try await subprocess.captureIOs()
             return (
-                processIdentifier: execution.processIdentifier,
-                standardOutput: try execution.captureStandardOutput(),
-                standardError: try execution.captureStandardError()
+                processIdentifier: subprocess.processIdentifier,
+                standardOutput: standardOutput,
+                standardError: standardError
             )
         }
         return CollectedResult(

Sources/FoundationEssentials/Subprocess/Subprocess+AsyncBytes.swift

@@ -41,9 +41,8 @@ extension Subprocess {
                 }
                 try Task.checkCancellation()
                 do {
-                    self.buffer = try await self.read(
-                        from: self.fileDescriptor,
-                        maxLength: AsyncBytes.bufferSize)
+                    self.buffer = try await self.fileDescriptor.read(
+                        upToLength: AsyncBytes.bufferSize)
                     self.currentPosition = 0
                     if self.buffer.count < AsyncBytes.bufferSize {
                         self.finished = true

Sources/FoundationEssentials/Subprocess/Subprocess+Configuration.swift

@@ -184,7 +184,7 @@ extension Subprocess {
             _ body: @Sendable @escaping (Subprocess, StandardInputWriter) async throws -> R
         ) async throws -> Result<R> {
             let (readFd, writeFd) = try FileDescriptor.pipe()
-            let executionInput: ExecutionInput = .customWrite(readFd, writeFd)
+            let executionInput: ExecutionInput = .init(storage: .customWrite(readFd, writeFd))
             let executionOutput: ExecutionOutput = try output.createExecutionOutput()
             let executionError: ExecutionOutput = try error.createExecutionOutput()
             let process: Subprocess = try self.spawn(