From: Shawn O. Pearce <spearce@spearce.org>
Date: Mon, 12 Mar 2007 18:37:28 +0000 (-0400)
Subject: Simplify closing two fds at once in run-command.c
X-Git-Tag: v1.5.1-rc1~45
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9dc09c766463333ca51311a2db86fd67f4fec19b;p=git.git

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>
---

diff --git a/run-command.c b/run-command.c
index 03ff7bcac..bef9775e0 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);