refactor subprocess to make it easier for windows port

Rather than tracking stdout/stderr explicitly, just keep an opaque
pointer to a platform-specific 'stream' type.  Also provide API
to get at the process output.

1 files changed, 7 insertions, 12 deletions

diff --git a/src/subprocess.h b/src/subprocess.h
index a1edb0d..048bacb 100644
--- a/src/subprocess.h
+++ b/src/subprocess.h
@@ -28,21 +28,16 @@ struct Subprocess {
   Subprocess();
   ~Subprocess();
   bool Start(const string& command);
-  void OnFDReady(int fd);
+  void OnFDReady();
   /// Returns true on successful process exit.
   bool Finish();
 
-  bool done() const {
-    return stdout_.fd_ == -1 && stderr_.fd_ == -1;
-  }
-
-  struct Stream {
-    Stream();
-    ~Stream();
-    int fd_;
-    string buf_;
-  };
-  Stream stdout_, stderr_;
+  bool Done() const;
+
+  const string& GetOutput() const;
+
+  struct Stream;
+  Stream* stream_;
   pid_t pid_;
 };