git-svn: get rid of Memoize for now...

[git.git] / pkt-line.c

diff --git a/pkt-line.c b/pkt-line.c
index 44d42969e558cf85aca41cf29604dcfda4ebaf7e..b4cb7e2756dcc52c17aebf4c0fc6adc7b415ef3c 100644 (file)
--- a/pkt-line.c
+++ b/pkt-line.c
@@ -16,8 +16,9 @@
  * The writing side could use stdio, but since the reading
  * side can't, we stay with pure read/write interfaces.
  */
-static void safe_write(int fd, const void *buf, unsigned n)
+ssize_t safe_write(int fd, const void *buf, ssize_t n)
 {
+       ssize_t nn = n;
        while (n) {
                int ret = xwrite(fd, buf, n);
                if (ret > 0) {
@@ -29,6 +30,7 @@ static void safe_write(int fd, const void *buf, unsigned n)
                        die("write error (disk full?)");
                die("write error (%s)", strerror(errno));
        }
+       return nn;
 }
 
 /*
@@ -70,7 +72,7 @@ static void safe_read(int fd, void *buffer, unsigned size)
                if (ret < 0)
                        die("read error (%s)", strerror(errno));
                if (!ret)
-                       die("unexpected EOF");
+                       die("The remote end hung up unexpectedly");
                n += ret;
        }
 }