From 28456eeb0e887f87d6029fd49d7b4ad1e04b4e99 Mon Sep 17 00:00:00 2001 From: Steffen Prohaska Date: Sun, 16 Dec 2007 23:01:37 +0100 Subject: [PATCH] Revert "Enhance the dup-dance in wt-status to work around t7502-commit.sh hang" This reverts commit 8f4e9dca13aba080505aa95897de2833b1f421d6. We'll instead take the solution from mingw/master with the next merge. --- wt-status.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/wt-status.c b/wt-status.c index 0b8a73fd44..51c1879691 100644 --- a/wt-status.c +++ b/wt-status.c @@ -321,17 +321,15 @@ static void wt_status_print_untracked(struct wt_status *s) static void wt_status_print_verbose(struct wt_status *s) { struct rev_info rev; - int saved_stdout, redirected_stdout; + int saved_stdout; fflush(s->fp); /* Sigh, the entire diff machinery is hardcoded to output to * stdout. Do the dup-dance...*/ saved_stdout = dup(STDOUT_FILENO); - redirected_stdout = dup(fileno(s->fp)); - if (saved_stdout < 0 || dup2(redirected_stdout, STDOUT_FILENO) < 0) + if (saved_stdout < 0 ||dup2(fileno(s->fp), STDOUT_FILENO) < 0) die("couldn't redirect stdout\n"); - close(redirected_stdout); init_revisions(&rev, NULL); setup_revisions(0, NULL, &rev, s->reference);