X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=pkt-line.c;h=c1e81f976f26726db2432f72f7356087a6e3a7d8;hb=29561ad0adadf4884858c209bb22b41d8d9a66ba;hp=bb3bab05cd203e114b24b778cb5f55218abdec95;hpb=3d990f110c2e5b8df83f6ab3ef83497f43c7fd47;p=git.git diff --git a/pkt-line.c b/pkt-line.c index bb3bab05c..c1e81f976 100644 --- a/pkt-line.c +++ b/pkt-line.c @@ -16,12 +16,13 @@ * 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) { - buf += ret; + buf = (char *) buf + ret; n -= ret; continue; } @@ -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; } /* @@ -66,7 +68,7 @@ static void safe_read(int fd, void *buffer, unsigned size) int n = 0; while (n < size) { - int ret = xread(fd, buffer + n, size - n); + int ret = xread(fd, (char *) buffer + n, size - n); if (ret < 0) die("read error (%s)", strerror(errno)); if (!ret)