Merge branch 'fix/frizlab/possible_objc_exception' into develop

Author: Frizlab

Sources/CLTLogger.swift

@@ -175,11 +175,11 @@ public struct CLTLogger : LogHandler {
 		/* We compute the data to print outside of the lock. */
 		let data = Self.format(message: message.description, flatMetadata: effectiveFlatMetadata, multilineMode: multilineMode, constants: constants)
 
-		Self.write(data, to: outputFileHandle)
+		Self.writeLog(data, to: outputFileHandle)
 	}
 
 	/** Writes to the given file descriptor like the logger would. */
-	public static func write(_ data: Data, to fh: FileHandle) {
+	public static func writeLog(_ data: Data, to fh: FileHandle) {
 		/* We lock, because the writeAll function might split the write in more than 1 write
 		 *  (if the write system call only writes a part of the data).
 		 * If another part of the program writes to the file descriptor, we might get interleaved data,
@@ -189,16 +189,42 @@ public struct CLTLogger : LogHandler {
 			/* Is the write retried on interrupt?
 			 * We’ll assume yes, but we don’t and can’t know for sure
 			 *  until FileHandle has been migrated to the open-source Foundation. */
-			if #available(macOS 10.15.4, iOS 13.4, tvOS 13.4, watchOS 6.2, *) {
-#if swift(>=5.2) || (!os(macOS) && !os(iOS) && !os(tvOS) && !os(watchOS))
+			if #available(macOS 10.15.4, tvOS 13.4, iOS 13.4, watchOS 6.2, *) {
+#if swift(>=5.2) || !canImport(Darwin)
 				_ = try? fh.write(contentsOf: data)
 #else
-				/* Note: This throws an actual objc exception if it fails. */
-				fh.write(data)
+				/* Let’s write “manullay” (FileHandle’s write(_:) method throws an ObjC exception in case of an error).
+				 * This code is copied below. */
+				data.withUnsafeBytes{ bytes in
+					guard !bytes.isEmpty else {
+						return
+					}
+					var written: Int = 0
+					repeat {
+						written += write(
+							fh.fileDescriptor,
+							bytes.baseAddress!.advanced(by: written),
+							bytes.count - written
+						)
+					} while written < bytes.count && (errno == EINTR || errno == EAGAIN)
+				}
 #endif
 			} else {
-				/* Note: This throws an actual objc exception if it fails. */
-				fh.write(data)
+				/* Let’s write “manullay” (FileHandle’s write(_:) method throws an ObjC exception in case of an error).
+				 * This is a copy of the code just above. */
+				data.withUnsafeBytes{ bytes in
+					guard !bytes.isEmpty else {
+						return
+					}
+					var written: Int = 0
+					repeat {
+						written += write(
+							fh.fileDescriptor,
+							bytes.baseAddress!.advanced(by: written),
+							bytes.count - written
+						)
+					} while written < bytes.count && (errno == EINTR || errno == EAGAIN)
+				}
 			}
 		}
 	}

Tests/CLTLoggerTests/CLTLoggerTests.swift

@@ -68,7 +68,7 @@ final class CLTLoggerTests : XCTestCase {
 		var logger = Logger(label: "my logger")
 		logger.logLevel = .trace
 
-		CLTLogger.write(Data("\n".utf8), to: .standardError)
+		CLTLogger.writeLog(Data("\n".utf8), to: .standardError)
 
 		logger.trace(   "trace:    Example of a log at this level. Isn’t it amazing?")
 		logger.debug(   "debug:    Example of a log at this level. Isn’t it amazing?")
@@ -78,11 +78,11 @@ final class CLTLoggerTests : XCTestCase {
 		logger.error(   "error:    Example of a log at this level. Isn’t it amazing?")
 		logger.critical("critical: Example of a log at this level. Isn’t it amazing?")
 
-		CLTLogger.write(Data("\n".utf8), to: .standardError)
+		CLTLogger.writeLog(Data("\n".utf8), to: .standardError)
 
 		logger.info("An informational message with metadata.", metadata: ["component": "LoggerTester", "array-value": .array(["1", "2", "3"]), "dictionary-value": .dictionary(["key1": "value1", "key2": "value2", "key3": "value3"])])
 
-		CLTLogger.write(Data("\n".utf8), to: .standardError)
+		CLTLogger.writeLog(Data("\n".utf8), to: .standardError)
 	}
 
 	func testVisual3() {