Fix compilation on Linux

Author: Frizlab

Sources/CGNUSourceExports/exports.h

@@ -10,11 +10,7 @@
 
 int spi_execvpe(const char *file, char *const argv[], char *const envp[]);
 
-
-/* In the same principle of importing the less stuff possible, we declare ptsname ourselves,
- *  though in this case we most definitely could import the whole of stdlib.h w/ _GNU_SOURCE set to 500 w/o conflict (we do it in the exports for the tests). */
-
+/* From stdlib.h w/ _GNU_SOURCE set to 500. */
 char *spi_ptsname(int fd);
 
-
 #endif /* exports_h */

Sources/CGNUSourceExportsForTests/exports_for_tests.c

@@ -0,0 +1,21 @@
+# define _XOPEN_SOURCE 600
+# include <fcntl.h>
+# include <stdlib.h>
+
+
+
+int spift_posix_openpt(int fd) {
+	return posix_openpt(fd);
+}
+
+int spift_grantpt(int fd) {
+	return grantpt(fd);
+}
+
+int spift_unlockpt(int fd) {
+	return unlockpt(fd);
+}
+
+char *spift_ptsname(int fd) {
+	return ptsname(fd);
+}

Sources/CGNUSourceExportsForTests/exports_for_tests.h

@@ -1,9 +1,18 @@
 #ifndef exports_for_tests_h
 # define exports_for_tests_h
 
-/* We need posix_openpt, grantpt, unlockpt and ptsname. */
-# define _XOPEN_SOURCE 600
-# include <fcntl.h>
-# include <stdlib.h>
+/* We need posix_openpt, grantpt, unlockpt and ptsname.
+ * Using the following used to work but does not anymore.
+ * AFAIU this is due to the `stat` struct being exported by this module and
+ *  being different than the one in CDispatch due to the `_XOPEN_SOURCE` define.
+ * So instead we write shims. */
+//# define _XOPEN_SOURCE 600
+//# include <fcntl.h>
+//# include <stdlib.h>
+
+int spift_posix_openpt(int);
+int spift_grantpt(int);
+int spift_unlockpt(int);
+char *spift_ptsname(int);
 
 #endif /* exports_for_tests_h */

Sources/ProcessInvocation/ProcessInvocation+Pipe.swift

@@ -9,6 +9,11 @@ import StreamReader
 
 
 
+/* Some utilities to avoid name clash with ProcessInvocation functions and avoid using `Darwin.` which does not exist on Linux.
+ * We’ll probably use System methods instead. */
+private func globalClose(_ fd: Int32) -> Int32 {close(fd)}
+private func globalWrite(_ fd: Int32, _ buf: UnsafeRawPointer!, _ nbyte: Int) -> Int {write(fd, buf, nbyte)}
+
 public extension ProcessInvocation {
 
 	/**
@@ -51,7 +56,7 @@ public extension ProcessInvocation {
 			fhWrite.writeabilityHandler = { fh in
 				let closeFH = {
 					fhWrite.writeabilityHandler = nil
-					if Darwin.close(fh.fileDescriptor) == -1 {
+					if globalClose(fh.fileDescriptor) == -1 {
 						Conf.logger?.error("Failed closing write end of fd for pipe to swift; pipe might stay open forever.", metadata: ["errno": "\(errno)", "errno-str": "\(Errno(rawValue: errno).localizedDescription)"])
 					}
 				}
@@ -67,7 +72,7 @@ public extension ProcessInvocation {
 							var ret: Int
 							repeat {
 								Conf.logger?.trace("Trying to write on write end of pipe.", metadata: ["bytes_count": "\(bytes.count)"])
-								ret = Darwin.write(fh.fileDescriptor, bytes.baseAddress!, bytes.count)
+								ret = globalWrite(fh.fileDescriptor, bytes.baseAddress!, bytes.count)
 							} while ret == -1 && errno == EINTR
 							return (ret, errno)
 						}()

Tests/ProcessInvocationTests/ProcessInvocationTests.swift

@@ -18,6 +18,13 @@ import CGNUSourceExportsForTests
 
 
 
+#if !canImport(Darwin)
+private let posix_openpt = spift_posix_openpt
+private let grantpt      = spift_grantpt
+private let unlockpt     = spift_unlockpt
+private let ptsname      = spift_ptsname
+#endif
+
 final class ProcessInvocationTests : XCTestCase {
 
 	override class func setUp() {