summaryrefslogtreecommitdiff
path: root/run-command.c
diff options
context:
space:
mode:
authorChristian Couder <chriscool@tuxfamily.org>2008-03-05 07:35:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-03-05 20:18:03 (GMT)
commitce2cf27adc434c11cd1e91bcacf00297efd8cc92 (patch)
tree73afc63de75c771f92f2135414b4218986598806 /run-command.c
parentc95b3ad9ea310ec89e31a21edecaaf2c374e2c46 (diff)
downloadgit-ce2cf27adc434c11cd1e91bcacf00297efd8cc92.zip
git-ce2cf27adc434c11cd1e91bcacf00297efd8cc92.tar.gz
git-ce2cf27adc434c11cd1e91bcacf00297efd8cc92.tar.bz2
run-command: Redirect stderr to a pipe before redirecting stdout to stderr
With this patch, in the 'start_command' function after forking we now take care of stderr in the child process before stdout. This way if 'start_command' is called with a 'child_process' argument like this: .err = -1; .stdout_to_stderr = 1; then stderr will be redirected to a pipe before stdout is redirected to stderr. So we can now get the process' stdout from the pipe (as well as its stderr). Earlier such a call would have redirected stdout to stderr before stderr was itself redirected, and therefore stdout would not have followed stderr, which would not have been very useful anyway. Update documentation in 'api-run-command.txt' accordingly. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Acked-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.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/run-command.c b/run-command.c
index 743757c..44100a7 100644
--- a/run-command.c
+++ b/run-command.c
@@ -91,6 +91,13 @@ int start_command(struct child_process *cmd)
close(cmd->in);
}
+ if (cmd->no_stderr)
+ dup_devnull(2);
+ else if (need_err) {
+ dup2(fderr[1], 2);
+ close_pair(fderr);
+ }
+
if (cmd->no_stdout)
dup_devnull(1);
else if (cmd->stdout_to_stderr)
@@ -103,13 +110,6 @@ int start_command(struct child_process *cmd)
close(cmd->out);
}
- if (cmd->no_stderr)
- dup_devnull(2);
- else if (need_err) {
- dup2(fderr[1], 2);
- close_pair(fderr);
- }
-
if (cmd->dir && chdir(cmd->dir))
die("exec %s: cd to %s failed (%s)", cmd->argv[0],
cmd->dir, strerror(errno));