From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>, Xavier Maillard <xma@gnu.org>
Cc: git@vger.kernel.org, nanako3@bluebottle.com, pascal@obry.net
Subject: [PATCH] Redirect stderr to a pipe before redirecting stdout to stderr
Date: Mon, 3 Mar 2008 08:21:11 +0100 [thread overview]
Message-ID: <20080303082111.24d3ea73.chriscool@tuxfamily.org> (raw)
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).
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
run-command.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
This patch should make my previous patch:
[PATCH 1/2] help: add "man.viewer" config var to use "woman" or "konqueror"
work as expected (at least with Emacs 21 and 22).
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);
- }
next reply other threads:[~2008-03-03 7:16 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-03 7:21 Christian Couder [this message]
2008-03-03 7:33 ` [PATCH] Redirect stderr to a pipe before redirecting stdout to stderr Shawn O. Pearce
2008-03-03 7:52 ` Christian Couder
2008-03-03 8:07 ` Johannes Sixt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080303082111.24d3ea73.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=nanako3@bluebottle.com \
--cc=pascal@obry.net \
--cc=xma@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).