Use canImport(Darwin) instead of !os(Linux)

Author: Frizlab

Package.swift

@@ -14,7 +14,7 @@ let          noSwiftSettings: [SwiftSetting] = []
  * See Process+Utils for reason why we use the eXtenderZ. */
 let useXtenderZ = (NSStringFromClass(Process().classForCoder) != "NSTask")
 /* Do we need the _GNU_SOURCE exports? This allows using execvpe on Linux. */
-#if !os(Linux)
+#if canImport(Darwin)
 let needsGNUSourceExports = false
 #else
 let needsGNUSourceExports = true

Sources/ProcessInvocation/ProcessInvocation.swift

@@ -12,7 +12,7 @@ import eXtenderZ
 import SignalHandling
 import StreamReader
 
-#if os(Linux)
+#if !canImport(Darwin)
 import CGNUSourceExports
 #endif
 import CMacroExports
@@ -494,13 +494,13 @@ public struct ProcessInvocation : AsyncSequence {
 				p.standardError = FileHandle(fileDescriptor: fdForWriting.rawValue, closeOnDealloc: false)
 		}
 
-#if !os(Linux)
+#if canImport(Darwin)
 		let platformSpecificInfo: Void = ()
 #else
 		var platformSpecificInfo = StreamReadPlatformSpecificInfo()
 #endif
 
-#if os(Linux)
+#if !canImport(Darwin)
 		for fd in outputFileDescriptors {
 			/* 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). */
@@ -603,7 +603,7 @@ public struct ProcessInvocation : AsyncSequence {
 			let sv = UnsafeMutablePointer<CInt>.allocate(capacity: 2)
 			sv.initialize(repeating: -1, count: 2)
 			defer {sv.deallocate()}
-#if !os(Linux)
+#if canImport(Darwin)
 			let sockDgram = SOCK_DGRAM
 #else
 			let sockDgram = Int32(SOCK_DGRAM.rawValue)
@@ -838,7 +838,7 @@ public struct ProcessInvocation : AsyncSequence {
 	   MARK: - Private
 	   *************** */
 
-#if !os(Linux)
+#if canImport(Darwin)
 	private typealias StreamReadPlatformSpecificInfo = Void
 #else
 	private struct StreamReadPlatformSpecificInfo {
@@ -905,7 +905,7 @@ public struct ProcessInvocation : AsyncSequence {
 	) {
 		do {
 			let toRead = Int(Swift.min(Swift.max(estimatedBytesAvailable, 1), UInt(Int.max)))
-#if !os(Linux)
+#if canImport(Darwin)
 			/* We do not need to check the number of bytes actually read.
 			 * If EOF was reached (nothing was read),
 			 *  the stream reader will remember it, and
@@ -1008,7 +1008,7 @@ public struct ProcessInvocation : AsyncSequence {
 		let buf = UnsafeMutableRawPointer.allocate(byteCount: SPI_CMSG_SPACE(sizeOfFd), alignment: MemoryLayout<cmsghdr>.alignment)
 		defer {buf.deallocate()}
 
-#if !os(Linux)
+#if canImport(Darwin)
 		msg.msg_control = UnsafeMutableRawPointer(buf)
 		msg.msg_controllen = socklen_t(SPI_CMSG_SPACE(sizeOfFd))
 #else
@@ -1020,15 +1020,15 @@ public struct ProcessInvocation : AsyncSequence {
 			throw Err.internalError("CMSG_FIRSTHDR returned nil.")
 		}
 
-#if !os(Linux)
+#if canImport(Darwin)
 		cmsg.pointee.cmsg_type = SCM_RIGHTS
 		cmsg.pointee.cmsg_level = SOL_SOCKET
 #else
 		cmsg.pointee.cmsg_type = Int32(SCM_RIGHTS)
 		cmsg.pointee.cmsg_level = SOL_SOCKET
 #endif
 
-#if !os(Linux)
+#if canImport(Darwin)
 		cmsg.pointee.cmsg_len = socklen_t(SPI_CMSG_LEN(sizeOfFd))
 #else
 		cmsg.pointee.cmsg_len = Int(SPI_CMSG_LEN(sizeOfFd))

Sources/ProcessInvocationBridge/ProcessInvocationBridge.swift

@@ -10,7 +10,7 @@ import CLTLogger
 import CMacroExports
 import Logging
 
-#if os(Linux)
+#if !canImport(Darwin)
 import CGNUSourceExports
 #endif
 
@@ -136,7 +136,7 @@ struct ProcessInvocationBridge : ParsableCommand {
 			Self.logger.trace("exec’ing.", metadata: ["executable": "\(toolName)"])
 			let ret: Int32
 			if usePath {
-#if !os(Linux)
+#if canImport(Darwin)
 				/* The P implementation of exec searches for the binary path in the given search path.
 				 * The v means we pass an array to exec (as opposed to the variadic exec variant, which is not available in Swift anyway). */
 				ret = execvP(toolName, path ?? _PATH_DEFPATH, cargs)
@@ -214,7 +214,7 @@ struct ProcessInvocationBridge : ParsableCommand {
 		defer {controlBuf.deallocate()}
 		controlBuf.update(repeating: 0, count: controlBufSize)
 		msg.msg_control = UnsafeMutableRawPointer(controlBuf)
-#if !os(Linux)
+#if canImport(Darwin)
 		msg.msg_controllen = socklen_t(controlBufSize)
 #else
 		msg.msg_controllen = Int(controlBufSize)

Tests/ProcessInvocationTests/ProcessInvocationTests.swift

@@ -302,7 +302,7 @@ final class ProcessInvocationTests : XCTestCase {
 			await tempAsyncAssertThrowsError(try await ProcessInvocation(spyScriptPath, usePATH: true,  customPATH: [Self.filesPath],                   signalsToProcess: []).invokeAndGetRawOutput())
 			await tempAsyncAssertNoThrow(try await ProcessInvocation(spyScriptPath,     usePATH: true,  customPATH: [Self.scriptsPath],                 signalsToProcess: []).invokeAndGetRawOutput())
 			await tempAsyncAssertNoThrow(try await ProcessInvocation(spyScriptPath,     usePATH: true,  customPATH: [Self.scriptsPath, Self.filesPath], signalsToProcess: []).invokeAndGetRawOutput())
-#if os(Linux)
+#if !canImport(Darwin)
 			/* On Linux, the error when trying to execute a non-executable file is correct (no permission), and so we don’t try next path available. */
 			await tempAsyncAssertThrowsError(try await ProcessInvocation(spyScriptPath, usePATH: true,  customPATH: [Self.filesPath, Self.scriptsPath], signalsToProcess: []).invokeAndGetRawOutput())
 #else