pass command results via a struct

WaitForCommand now passes all command output via a struct.
This will allow adding more output in a future change.

1 files changed, 11 insertions, 2 deletions

diff --git a/src/build.h b/src/build.h
index 5747170..fa73620 100644
--- a/src/build.h
+++ b/src/build.h
@@ -103,8 +103,17 @@ struct CommandRunner {
   virtual ~CommandRunner() {}
   virtual bool CanRunMore() = 0;
   virtual bool StartCommand(Edge* edge) = 0;
-  /// Wait for a command to complete.
-  virtual Edge* WaitForCommand(ExitStatus* status, string* output) = 0;
+
+  /// The result of waiting for a command.
+  struct Result {
+    Result() : edge(NULL) {}
+    Edge* edge;
+    ExitStatus status;
+    string output;
+  };
+  /// Wait for a command to complete, or return false if interrupted.
+  virtual bool WaitForCommand(Result* result) = 0;
+
   virtual vector<Edge*> GetActiveEdges() { return vector<Edge*>(); }
   virtual void Abort() {}
 };