Merge branch 'jc/reflog'

[git.git] / write_or_die.c

diff --git a/write_or_die.c b/write_or_die.c
index 8cf6486025a0fffba889618ce07a0d4eadd139df..a119e1d208445093dd1d2869729eca9435aa020e 100644 (file)
--- a/write_or_die.c
+++ b/write_or_die.c
@@ -1,60 +1,107 @@
 #include "cache.h"
 
-void read_or_die(int fd, void *buf, size_t count)
+int read_in_full(int fd, void *buf, size_t count)
 {
        char *p = buf;
-       ssize_t loaded;
+       ssize_t total = 0;
+       ssize_t loaded = 0;
 
        while (count > 0) {
                loaded = xread(fd, p, count);
-               if (loaded == 0)
-                       die("unexpected end of file");
-               else if (loaded < 0)
-                       die("read error (%s)", strerror(errno));
+               if (loaded <= 0) {
+                       if (total)
+                               return total;
+                       else
+                               return loaded;
+               }
                count -= loaded;
                p += loaded;
+               total += loaded;
        }
+
+       return total;
 }
 
-void write_or_die(int fd, const void *buf, size_t count)
+void read_or_die(int fd, void *buf, size_t count)
+{
+       ssize_t loaded;
+
+       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 written;
+       ssize_t total = 0;
+       ssize_t written = 0;
 
        while (count > 0) {
                written = xwrite(fd, p, count);
-               if (written == 0)
-                       die("disk full?");
-               else if (written < 0) {
-                       if (errno == EPIPE)
-                               exit(0);
-                       die("write error (%s)", strerror(errno));
+               if (written <= 0) {
+                       if (total)
+                               return total;
+                       else
+                               return written;
                }
                count -= written;
                p += written;
+               total += written;
        }
+
+       return total;
+}
+
+void write_or_die(int fd, const void *buf, size_t count)
+{
+       ssize_t written;
+
+       written = write_in_full(fd, buf, count);
+       if (written == 0)
+               die("disk full?");
+       else if (written < 0) {
+               if (errno == EPIPE)
+                       exit(0);
+               die("write error (%s)", strerror(errno));
+       }
+}
+
+int write_or_whine_pipe(int fd, const void *buf, size_t count, const char *msg)
+{
+       ssize_t written;
+
+       written = write_in_full(fd, buf, count);
+       if (written == 0) {
+               fprintf(stderr, "%s: disk full?\n", msg);
+               return 0;
+       }
+       else if (written < 0) {
+               if (errno == EPIPE)
+                       exit(0);
+               fprintf(stderr, "%s: write error (%s)\n",
+                       msg, strerror(errno));
+               return 0;
+       }
+
+       return 1;
 }
 
 int write_or_whine(int fd, const void *buf, size_t count, const char *msg)
 {
-       const char *p = buf;
        ssize_t written;
 
-       while (count > 0) {
-               written = xwrite(fd, p, count);
-               if (written == 0) {
-                       fprintf(stderr, "%s: disk full?\n", msg);
-                       return 0;
-               }
-               else if (written < 0) {
-                       if (errno == EPIPE)
-                               exit(0);
-                       fprintf(stderr, "%s: write error (%s)\n",
-                               msg, strerror(errno));
-                       return 0;
-               }
-               count -= written;
-               p += written;
+       written = write_in_full(fd, buf, count);
+       if (written == 0) {
+               fprintf(stderr, "%s: disk full?\n", msg);
+               return 0;
+       }
+       else if (written < 0) {
+               fprintf(stderr, "%s: write error (%s)\n",
+                       msg, strerror(errno));
+               return 0;
        }
 
        return 1;