global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-13 18:33:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'mingw/master' into devel

Browse Source
This commit is contained in:
Steffen Prohaska
2007-12-16 23:03:17 +01:00
parent 28456eeb0e 3805d58757
commit 50e2ee0efa
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wt-status.c
View File

@@ -321,15 +321,17 @@ 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;
int saved_stdout = -1;
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");
if (fileno(s->fp) != STDOUT_FILENO) {
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);
@@ -340,7 +342,7 @@ static void wt_status_print_verbose(struct wt_status *s)
fflush(stdout);
if (dup2(saved_stdout, STDOUT_FILENO) < 0)
if (saved_stdout >= 0 && dup2(saved_stdout, STDOUT_FILENO) < 0)
die("couldn't restore stdout\n");
close(saved_stdout);
}