Fix compilation on Swift <=5.10

Author: Frizlab

Sources/ManualTests/main.swift

@@ -65,6 +65,7 @@ do {
 //		print("From cat: \(line.strLineOrHex())")
 //	}
 
+#if swift(>=5.7)
 	/* Try to read one line from ProcessInvocation and then one using StreamReader. */
 	let pi = ProcessInvocation("head", "-n", "1")
 	for try await line in pi {
@@ -76,6 +77,7 @@ do {
 	} else {
 		print("Failed reading line from stream reader.")
 	}
+#endif
 } catch {
 	print("Failed running the process: \(error)")
 }
@@ -133,6 +135,8 @@ func setRequireNonBlockingIO(on fd: FileDescriptor, logChange: Bool) throws {
 	}
 }
 
+typealias FileDescriptorReader = GenericStreamReader
+
 
 
 

Sources/ProcessInvocation/FileDescriptor+GenericReadStream.swift

@@ -5,10 +5,21 @@ import SystemPackage
 
 
 
+#if compiler(>=6.0)
 extension FileDescriptor : @retroactive GenericReadStream {
 
 	public func read(_ buffer: UnsafeMutableRawPointer, maxLength len: Int) throws -> Int {
 		return try read(into: UnsafeMutableRawBufferPointer(start: buffer, count: len))
 	}
 
 }
+#else
+extension FileDescriptor : GenericReadStream {
+	
+	public func read(_ buffer: UnsafeMutableRawPointer, maxLength len: Int) throws -> Int {
+		return try read(into: UnsafeMutableRawBufferPointer(start: buffer, count: len))
+	}
+	
+}
+#endif
+typealias FileDescriptorReader = GenericStreamReader

Sources/ProcessInvocation/ProcessInvocation+Pipe.swift

@@ -60,7 +60,7 @@ public extension ProcessInvocation {
 				do {
 					try reader.peekData(size: Swift.max(0, maxCacheSize - (reader.currentStreamReadPosition - reader.currentReadPosition)), allowReadingLess: true, { _ in })
 					try reader.peekData(size: reader.currentStreamReadPosition - reader.currentReadPosition, allowReadingLess: false, { bytes in
-						let (writtenNow, readError) = {
+						let (writtenNow, readError) = { () -> (Int, Int32) in
 							guard bytes.count > 0 else {
 								return (0, Int32(0))
 							}

Sources/ProcessInvocation/ProcessInvocation.swift

@@ -529,7 +529,7 @@ public struct ProcessInvocation : AsyncSequence {
 			/* Let’s see if the fd is a master pt or not.
 			 * This is needed to detect EOF properly and not throw an error when reading from a master pt (see handleProcessOutput for more info). */
 			if spi_ptsname(fd.rawValue) == nil {
-				let error = Errno(rawValue: errno)
+				let error = SystemPackage.Errno(rawValue: errno)
 				if error.rawValue != ENOTTY {
 					Conf.logger?.warning("Cannot determine whether fd is a master pt or not; assuming it’s not.", metadata: ["fd": "\(fd.rawValue)", "error": "\(error)"])
 				}

Tests/ProcessInvocationTests/ProcessInvocationTests.swift

@@ -140,15 +140,31 @@ final class ProcessInvocationTests : XCTestCase {
 	}
 
 	func testProcessTerminationHandler() throws {
+#if swift(>=5.10)
 		nonisolated(unsafe) var wentIn = false
-		let (_, g) = try ProcessInvocation("/bin/cat", stdinRedirect: .fromNull, signalsToProcess: []).invoke(outputHandler: { _,_,_ in }, terminationHandler: { p in
+#else
+		final class BoolRef : @unchecked Sendable {
+			var value = false
+		}
+		let wentIn = BoolRef()
+#endif
+		/* Note: The @Sendable annotation is for Swift 5.5. */
+		let (_, g) = try ProcessInvocation("/bin/cat", stdinRedirect: .fromNull, signalsToProcess: []).invoke(outputHandler: { _,_,_ in }, terminationHandler: { @Sendable p in
+#if swift(>=5.10)
 			wentIn = true
+#else
+			wentIn.value = true
+#endif
 		})
 
 		/* No need to wait on the process anymore */
 		g.wait()
 
+#if swift(>=5.10)
 		XCTAssertTrue(wentIn)
+#else
+		XCTAssertTrue(wentIn.value)
+#endif
 	}
 
 	func testNonStandardFdCapture() throws {

TestsData/scripts/check-cwd+env.swift

@@ -1,4 +1,5 @@
-#!/usr/bin/env -S swift
+#!/usr/bin/env swift
+/* In theory there should be a -S option to env, but on Swift 5.5 docker image the option does not exist! */
 import Foundation
 
 

TestsData/scripts/slow-and-interleaved-output.swift

@@ -1,4 +1,5 @@
-#!/usr/bin/env -S swift
+#!/usr/bin/env swift
+/* In theory there should be a -S option to env, but on Swift 5.5 docker image the option does not exist! */
 import Foundation
 
 

TestsData/scripts/spy.swift

@@ -1,4 +1,5 @@
-#!/usr/bin/env -S swift
+#!/usr/bin/env swift
+/* In theory there should be a -S option to env, but on Swift 5.5 docker image the option does not exist! */
 import Foundation
 
 print("I spy with my little eye")

TestsData/scripts/write-500-lines.swift

@@ -1,4 +1,5 @@
-#!/usr/bin/env -S swift
+#!/usr/bin/env swift
+/* In theory there should be a -S option to env, but on Swift 5.5 docker image the option does not exist! */
 import Foundation