[PATCH 1/4] Simplify closing two fds at once in run-command.c
- From
Shawn O. Pearce <spearce@spearce.org>
- Date
- Mar 12, 2007, 18:37 UTC
- Message-ID
- <20070312183728.GA15996@spearce.org>
I started hacking on a change to add stdout redirection support to the run_command family, but found I was using a lot of close calls on two pipes in an array (such as for pipe). So I'm doing a tiny bit of refactoring first to make the next set of changes clearer.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org> --- run-command.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/run-command.c b/run-command.c index 03ff7bc..bef9775 100644 --- a/run-command.c +++ b/run-command.c @@ -2,6 +2,12 @@ #include "run-command.h" #include "exec_cmd.h" +static inline void close_pair(int fd[2]) +{ + close(fd[0]); + close(fd[1]); +} + int start_command(struct child_process *cmd) { int need_in = !cmd->no_stdin && cmd->in < 0; @@ -16,10 +22,8 @@ int start_command(struct child_process *cmd) cmd->pid = fork(); if (cmd->pid < 0) { - if (need_in) { - close(fdin[0]); - close(fdin[1]); - } + if (need_in) + close_pair(fdin); return -ERR_RUN_COMMAND_FORK; } @@ -30,8 +34,7 @@ int start_command(struct child_process *cmd) close(fd); } else if (need_in) { dup2(fdin[0], 0); - close(fdin[0]); - close(fdin[1]); + close_pair(fdin); } else if (cmd->in) { dup2(cmd->in, 0); close(cmd->in);
-- 1.5.0.3.985.gcf0b4