logging: separate by \r as well as \n and filter empty lines

utmapp · Apr 29, 2024 · a3dca97 · a3dca97
1 parent 06b806f
commit a3dca97
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/Sources/QEMUKitInternal/QEMULogging.m b/Sources/QEMUKitInternal/QEMULogging.m
@@ -139,12 +139,14 @@ - (BOOL)redirectStandardFds {
         return @[];
     }
     NSString *string = [*buffer stringByAppendingString:line];
-    NSArray *lines = [string componentsSeparatedByString:@"\n"];
+    NSArray *lines = [string componentsSeparatedByCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@"\r\n"]];
     *buffer = [lines lastObject];
     if (lines.count > 0) {
         lines = [lines subarrayWithRange:NSMakeRange(0, lines.count - 1)];
     }
-    return lines;
+
+    // remove empty lines
+    return [lines filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"count > 0"]];
 }
 
 - (void)logToFile:(NSURL *)path {