summaryrefslogtreecommitdiffstats
path: root/write-or-die.c
diff options
context:
space:
mode:
Diffstat (limited to 'write-or-die.c')
-rw-r--r--write-or-die.c27
1 files changed, 12 insertions, 15 deletions
diff --git a/write-or-die.c b/write-or-die.c
index 42a2dc7..01a9a51 100644
--- a/write-or-die.c
+++ b/write-or-die.c
@@ -18,23 +18,20 @@
*/
void maybe_flush_or_die(FILE *f, const char *desc)
{
- static int skip_stdout_flush = -1;
- struct stat st;
- char *cp;
-
if (f == stdout) {
- if (skip_stdout_flush < 0) {
- /* NEEDSWORK: make this a normal Boolean */
- cp = getenv("GIT_FLUSH");
- if (cp)
- skip_stdout_flush = (atoi(cp) == 0);
- else if ((fstat(fileno(stdout), &st) == 0) &&
- S_ISREG(st.st_mode))
- skip_stdout_flush = 1;
- else
- skip_stdout_flush = 0;
+ static int force_flush_stdout = -1;
+
+ if (force_flush_stdout < 0) {
+ force_flush_stdout = git_env_bool("GIT_FLUSH", -1);
+ if (force_flush_stdout < 0) {
+ struct stat st;
+ if (fstat(fileno(stdout), &st))
+ force_flush_stdout = 1;
+ else
+ force_flush_stdout = !S_ISREG(st.st_mode);
+ }
}
- if (skip_stdout_flush && !ferror(f))
+ if (!force_flush_stdout && !ferror(f))
return;
}
if (fflush(f)) {