Merge pull request #136 from archaeopterasa/output_fix

Fix the broken simulator output in issue #134
ios-control · Jan 6, 2015 · 890e272 · 890e272
2 parents 0d86493 + f89ff3f
commit 890e272
Showing 1 changed file with 24 additions and 3 deletions.
diff --git a/Source/iPhoneSimulator.m b/Source/iPhoneSimulator.m
@@ -331,7 +331,8 @@ - (void)stdioDataIsAvailable:(NSNotification *)notification {
 
 
 - (void)createStdioFIFO:(NSFileHandle **)fileHandle ofType:(NSString *)type atPath:(NSString **)path {
-  *path = [NSString stringWithFormat:@"%@/ios-sim-%@-pipe-%d", NSTemporaryDirectory(), type, (int)time(NULL)];
+  NSString *filename = [NSString stringWithFormat:@"ios-sim-%@-pipe-%d", type, (int)time(NULL)];
+  *path = [NSTemporaryDirectory() stringByAppendingPathComponent:filename];
   if (mkfifo([*path UTF8String], S_IRUSR | S_IWUSR) == -1) {
     nsprintf(@"Unable to create %@ named pipe `%@'", type, *path);
     exit(EXIT_FAILURE);
@@ -367,6 +368,22 @@ - (BOOL) version:(NSString*)versionA isAtLeastVersion:(NSString*)versionB
     return ([versionA compare:versionB options:NSNumericSearch] != NSOrderedAscending);
 }
 
+// Given a filesystem path, creates all intermediate directories up to but not
+// including the final path component.
+- (void)createContainingDirectoryOrDie:(NSString *)path
+{
+  NSString* containingDirectory = [path stringByDeletingLastPathComponent];
+  NSError *error = nil;
+  [[NSFileManager defaultManager] createDirectoryAtPath:containingDirectory
+                          withIntermediateDirectories:YES
+                                           attributes:nil
+                                                error:&error];
+  if (error != nil) {
+    nsprintf(@"Unable to create directory `%@': %@", NSTemporaryDirectory(), error);
+    exit(EXIT_FAILURE);
+  }
+}
+
 - (int)launchApp:(NSString *)path withFamily:(NSString *)family
                                         uuid:(NSString *)uuid
                                  environment:(NSDictionary *)environment
@@ -447,8 +464,12 @@ - (int)launchApp:(NSString *)path withFamily:(NSString *)family
     // Create symbolic links in the data directory that points at the real stdout/stderr paths.
     if ([self version:config.simulatedSystemRoot.sdkVersion isAtLeastVersion:@"8.0"]) {
       NSString* dataPath = config.device.dataPath;
-      [[NSFileManager defaultManager] createSymbolicLinkAtPath:[dataPath stringByAppendingPathComponent:stdoutPath] withDestinationPath:stdoutPath error:NULL];
-      [[NSFileManager defaultManager] createSymbolicLinkAtPath:[dataPath stringByAppendingPathComponent:stderrPath] withDestinationPath:stderrPath error:NULL];
+      NSString* stdoutLinkPath = [dataPath stringByAppendingPathComponent:stdoutPath];
+      [self createContainingDirectoryOrDie:stdoutLinkPath];
+      [[NSFileManager defaultManager] createSymbolicLinkAtPath:stdoutLinkPath withDestinationPath:stdoutPath error:NULL];
+      NSString* stderrLinkPath = [dataPath stringByAppendingPathComponent:stderrPath];
+      [self createContainingDirectoryOrDie:stderrLinkPath];
+      [[NSFileManager defaultManager] createSymbolicLinkAtPath:stderrLinkPath withDestinationPath:stderrPath error:NULL];
     }
   } else {
     // Xcode5 or older