Merge pull request #1226 from colincross/close-fds

nico · web-flow · commit 9e71431e6f83 · 2017-01-13T11:04:43.000-05:00
Close original pipe fd in subprocesses
diff --git a/src/subprocess-posix.cc b/src/subprocess-posix.cc
@@ -88,6 +88,8 @@ bool Subprocess::Start(SubprocessSet* set, const string& command) {
       Fatal("posix_spawn_file_actions_adddup2: %s", strerror(errno));
     if (posix_spawn_file_actions_adddup2(&action, output_pipe[1], 2) != 0)
       Fatal("posix_spawn_file_actions_adddup2: %s", strerror(errno));
+    if (posix_spawn_file_actions_addclose(&action, output_pipe[1]) != 0)
+      Fatal("posix_spawn_file_actions_addclose: %s", strerror(errno));
     // In the console case, output_pipe is still inherited by the child and
     // closed when the subprocess finishes, which then notifies ninja.
   }

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,8 @@ bool Subprocess::Start(SubprocessSet* set, const string& command) {`
`88`	`88`	`Fatal("posix_spawn_file_actions_adddup2: %s", strerror(errno));`
`89`	`89`	`if (posix_spawn_file_actions_adddup2(&action, output_pipe[1], 2) != 0)`
`90`	`90`	`Fatal("posix_spawn_file_actions_adddup2: %s", strerror(errno));`
	`91`	`+ if (posix_spawn_file_actions_addclose(&action, output_pipe[1]) != 0)`
	`92`	`+ Fatal("posix_spawn_file_actions_addclose: %s", strerror(errno));`
`91`	`93`	`// In the console case, output_pipe is still inherited by the child and`
`92`	`94`	`// closed when the subprocess finishes, which then notifies ninja.`
`93`	`95`	`}`