return the prune-packed progress display to the inner loop

diff --git a/write_or_die.c b/write_or_die.c
index 1224cac5da7e8bf51266eadf24e9e58e6e5a37cb..e125e11d3b63e3dab9077d7b414e83e7ff7d16ad 100644 (file)
--- a/write_or_die.c
+++ b/write_or_die.c
@@ -1,19 +1,54 @@
 #include "cache.h"
 
+/*
+ * Some cases use stdio, but want to flush after the write
+ * to get error handling (and to get better interactive
+ * behaviour - not buffering excessively).
+ *
+ * Of course, if the flush happened within the write itself,
+ * we've already lost the error code, and cannot report it any
+ * more. So we just ignore that case instead (and hope we get
+ * the right error code on the flush).
+ *
+ * If the file handle is stdout, and stdout is a file, then skip the
+ * flush entirely since it's not needed.
+ */
+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) {
+                       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;
+               }
+               if (skip_stdout_flush && !ferror(f))
+                       return;
+       }
+       if (fflush(f)) {
+               if (errno == EPIPE)
+                       exit(0);
+               die("write failure on %s: %s", desc, strerror(errno));
+       }
+}
+
 int read_in_full(int fd, void *buf, size_t count)
 {
        char *p = buf;
        ssize_t total = 0;
-       ssize_t loaded = 0;
 
        while (count > 0) {
-               loaded = xread(fd, p, count);
-               if (loaded <= 0) {
-                       if (total)
-                               return total;
-                       else
-                               return loaded;
-               }
+               ssize_t loaded = xread(fd, p, count);
+               if (loaded <= 0)
+                       return total ? total : loaded;
                count -= loaded;
                p += loaded;
                total += loaded;
@@ -22,26 +57,13 @@ int read_in_full(int fd, void *buf, size_t count)
        return total;
 }
 
-void read_or_die(int fd, void *buf, size_t count)
-{
-       ssize_t loaded;
-
-       if (!count)
-               return;
-       loaded = read_in_full(fd, buf, count);
-       if (loaded == 0)
-               die("unexpected end of file");
-       else if (loaded < 0)
-               die("read error (%s)", strerror(errno));
-}
-
 int write_in_full(int fd, const void *buf, size_t count)
 {
        const char *p = buf;
        ssize_t total = 0;
 
        while (count > 0) {
-               size_t written = xwrite(fd, p, count);
+               ssize_t written = xwrite(fd, p, count);
                if (written < 0)
                        return -1;
                if (!written) {