summaryrefslogtreecommitdiff
path: root/run-command.c
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-03-12 18:37:28 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-03-12 23:31:35 (GMT)
commit9dc09c766463333ca51311a2db86fd67f4fec19b (patch)
tree80b28324813c28d2dfdbfa89904937423cb96851 /run-command.c
parent1358e7d670306a9fe8a612f1ebd1f058474d20af (diff)
downloadgit-9dc09c766463333ca51311a2db86fd67f4fec19b.zip
git-9dc09c766463333ca51311a2db86fd67f4fec19b.tar.gz
git-9dc09c766463333ca51311a2db86fd67f4fec19b.tar.bz2
Simplify closing two fds at once in run-command.c
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> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'run-command.c')
-rw-r--r--run-command.c15
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);