diff options
| author | Johannes Sixt <johannes.sixt@telecom.at> | 2008-02-16 18:36:38 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-23 11:59:44 -0800 |
| commit | e72ae28895b22052b7ca2eef36c039ac62671f7d (patch) | |
| tree | 35e5df11a285b4467054fcec75cf8e35f38093e1 /run-command.c | |
| parent | 923d44aeb7cb6d21eeb459fdc1b58137e37c2b1c (diff) | |
| download | git-e72ae28895b22052b7ca2eef36c039ac62671f7d.tar.gz git-e72ae28895b22052b7ca2eef36c039ac62671f7d.tar.xz | |
start_command(), .in/.out/.err = -1: Callers must close the file descriptor
By setting .in, .out, or .err members of struct child_process to -1, the
callers of start_command() can request that a pipe is allocated that talks
to the child process and one end is returned by replacing -1 with the
file descriptor.
Previously, a flag was set (for .in and .out, but not .err) to signal
finish_command() to close the pipe end that start_command() had handed out,
so it was optional for callers to close the pipe, and many already do so.
Now we make it mandatory to close the pipe.
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'run-command.c')
| -rw-r--r-- | run-command.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/run-command.c b/run-command.c index 476d00c21..291933036 100644 --- a/run-command.c +++ b/run-command.c @@ -25,7 +25,6 @@ int start_command(struct child_process *cmd) if (pipe(fdin) < 0) return -ERR_RUN_COMMAND_PIPE; cmd->in = fdin[1]; - cmd->close_in = 1; } need_out = !cmd->no_stdout @@ -38,7 +37,6 @@ int start_command(struct child_process *cmd) return -ERR_RUN_COMMAND_PIPE; } cmd->out = fdout[0]; - cmd->close_out = 1; } need_err = !cmd->no_stderr && cmd->err < 0; @@ -157,10 +155,6 @@ static int wait_or_whine(pid_t pid) int finish_command(struct child_process *cmd) { - if (cmd->close_in) - close(cmd->in); - if (cmd->close_out) - close(cmd->out); return wait_or_whine(cmd->pid); } |