Merge pull request #15 from vapor/terminal-fix

Terminal fix
vapor · Sep 7, 2016 · ef60f09 · ef60f09
2 parents 93ea910 + 090ed92
commit ef60f09
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Sources/Console/Console/ConsoleError.swift b/Sources/Console/Console/ConsoleError.swift
@@ -6,6 +6,7 @@ public enum ConsoleError: Swift.Error {
     case argumentNotFound
     case commandNotFound(String)
     case cancelled
+    case spawnProcess
     case execute(Int)
     case backgroundExecute(Int, String)
     case fileOrDirectoryNotFound

diff --git a/Sources/Console/Terminal/Terminal.swift b/Sources/Console/Terminal/Terminal.swift
@@ -131,7 +131,14 @@ public class Terminal: ConsoleProtocol {
         }
 
         _pids.append(pid)
-        let result = posix_spawnp(pid, argv[0], &fileActions, nil, argv + [nil], env + [nil])
+        let spawned = posix_spawnp(pid, argv[0], &fileActions, nil, argv + [nil], env + [nil])
+        if spawned != 0 {
+            throw ConsoleError.spawnProcess
+        }
+
+        var result: Int32 = 0
+        _ = waitpid(pid.pointee, &result, 0)
+        result = result / 256
 
         waitpid(pid.pointee, nil, 0)