From: Kristian Høgsberg <krh@redhat.com>
Date: Mon, 10 Mar 2008 17:58:26 +0000 (-0400)
Subject: wt-status.c: no need for dup() dance anymore
X-Git-Tag: v1.5.5-rc0~7^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4ba0cb27c1c0c3aa65d28e1891c1f3dca3db5f93;p=git.git

wt-status.c: no need for dup() dance anymore

Now we can generate diff to a file descriptor, we do not have to
dup() the stdout around when writing the status output.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/wt-status.c b/wt-status.c
index 701d13da7..b3fd57b79 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -269,27 +269,14 @@ 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;
-
-	fflush(s->fp);
-
-	/* Sigh, the entire diff machinery is hardcoded to output to
-	 * stdout.  Do the dup-dance...*/
-	saved_stdout = dup(STDOUT_FILENO);
-	if (saved_stdout < 0 ||dup2(fileno(s->fp), STDOUT_FILENO) < 0)
-		die("couldn't redirect stdout\n");
 
 	init_revisions(&rev, NULL);
 	setup_revisions(0, NULL, &rev, s->reference);
 	rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
 	rev.diffopt.detect_rename = 1;
+	rev.diffopt.file = s->fp;
+	rev.diffopt.close_file = 0;
 	run_diff_index(&rev, 1);
-
-	fflush(stdout);
-
-	if (dup2(saved_stdout, STDOUT_FILENO) < 0)
-		die("couldn't restore stdout\n");
-	close(saved_stdout);
 }
 
 void wt_status_print(struct wt_status *s)