gitweb: Fix git_patchset_body not closing <div class="patch">

diff --git a/write_or_die.c b/write_or_die.c
index e7f82639ffb068dd754855ca464a20721a36c9db..a119e1d208445093dd1d2869729eca9435aa020e 100644 (file)
--- a/write_or_die.c
+++ b/write_or_die.c
@@ -33,45 +33,40 @@ void read_or_die(int fd, void *buf, size_t count)
                die("read error (%s)", strerror(errno));
 }
 
-void write_or_die(int fd, const void *buf, size_t count)
+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;
 }
 
-int write_in_full(int fd, const void *buf, size_t count)
+void write_or_die(int fd, const void *buf, size_t count)
 {
-       const char *p = buf;
-       ssize_t total = 0;
-       ssize_t wcount = 0;
+       ssize_t written;
 
-       while (count > 0) {
-               wcount = xwrite(fd, p, count);
-               if (wcount <= 0) {
-                       if (total)
-                               return total;
-                       else
-                               return wcount;
-               }
-               count -= wcount;
-               p += wcount;
-               total += wcount;
+       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));
        }
-
-       return wcount;
 }
 
 int write_or_whine_pipe(int fd, const void *buf, size_t count, const char *msg)