summaryrefslogtreecommitdiffstats
path: root/src/subprocess-win32.cc
diff options
context:
space:
mode:
authorEvan Martin <martine@danga.com>2011-05-06 21:20:34 (GMT)
committerEvan Martin <martine@danga.com>2011-05-08 20:52:51 (GMT)
commit70931062b988d8df44656e7b0555821181bc8315 (patch)
tree5f384e658793a547b61163640e6dd41ca691becf /src/subprocess-win32.cc
parenta0fef96444b11f48b6350969c50c21ab7ef37ddd (diff)
downloadNinja-70931062b988d8df44656e7b0555821181bc8315.zip
Ninja-70931062b988d8df44656e7b0555821181bc8315.tar.gz
Ninja-70931062b988d8df44656e7b0555821181bc8315.tar.bz2
windows: pass subprocess tests
Diffstat (limited to 'src/subprocess-win32.cc')
-rw-r--r--src/subprocess-win32.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/subprocess-win32.cc b/src/subprocess-win32.cc
index 2efec00..4649ee3 100644
--- a/src/subprocess-win32.cc
+++ b/src/subprocess-win32.cc
@@ -95,8 +95,10 @@ bool Subprocess::Start(struct SubprocessSet* set, const string& command) {
startup_info.cb = sizeof(STARTUPINFO);
startup_info.dwFlags = STARTF_USESTDHANDLES;
startup_info.hStdOutput = child_pipe;
+ // TODO: what does this hook up stdin to?
startup_info.hStdInput = NULL;
- startup_info.hStdError = NULL; // TODO: handle child stderr as well.
+ // TODO: is it ok to reuse pipe like this?
+ startup_info.hStdError = child_pipe;
PROCESS_INFORMATION process_info;
@@ -121,7 +123,7 @@ bool Subprocess::Start(struct SubprocessSet* set, const string& command) {
void Subprocess::OnPipeReady() {
DWORD bytes;
- if (!GetOverlappedResult(pipe_, &overlapped_, &bytes, FALSE)) {
+ if (!GetOverlappedResult(pipe_, &overlapped_, &bytes, TRUE)) {
if (GetLastError() == ERROR_BROKEN_PIPE) {
CloseHandle(pipe_);
pipe_ = NULL;