Shawn O. PearceLike the out pipe and in pipe, we now automatically close the err pipe if it was requested by the caller and it hasn't been closed by the caller. This simplifies anyone who wants to get a pipe to the stderr stream for another process.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org> --- run-command.c | 3 +++ run-command.h | 1 + 2 files changed, 4 insertions(+), 0 deletions(-)
Show changes to 2 files +4 −0
run-command.c, run-command.h
diff --git a/run-command.c b/run-command.c index 52f80be..7bf2cd7 100644 --- a/run-command.c +++ b/run-command.c @@ -51,6 +51,7 @@ int start_command(struct child_process *cmd) return -ERR_RUN_COMMAND_PIPE; } cmd->err = fderr[0]; + cmd->close_err = 1; } cmd->pid = fork(); @@ -161,6 +162,8 @@ int finish_command(struct child_process *cmd) close(cmd->in); if (cmd->close_out) close(cmd->out); + if (cmd->close_err) + close(cmd->err); return wait_or_whine(cmd->pid); } diff --git a/run-command.h b/run-command.h index 1fc781d..705cf2f 100644 --- a/run-command.h +++ b/run-command.h @@ -21,6 +21,7 @@ struct child_process { const char *const *env; unsigned close_in:1; unsigned close_out:1; + unsigned close_err:1; unsigned no_stdin:1; unsigned no_stdout:1; unsigned no_stderr:1;
-- 1.5.4.rc5.1126.g6ba14