X-Git-Url: https://git.octo.it/?p=git.git;a=blobdiff_plain;f=pkt-line.c;h=bb3bab05cd203e114b24b778cb5f55218abdec95;hp=69473046bf717c9b97470d7652c15377dd9fc9d5;hb=HEAD;hpb=51017101c7a308745ba3c04944457f1dc6a55780 diff --git a/pkt-line.c b/pkt-line.c index 69473046..bb3bab05 100644 --- a/pkt-line.c +++ b/pkt-line.c @@ -19,7 +19,7 @@ static void safe_write(int fd, const void *buf, unsigned n) { while (n) { - int ret = write(fd, buf, n); + int ret = xwrite(fd, buf, n); if (ret > 0) { buf += ret; n -= ret; @@ -27,8 +27,6 @@ static void safe_write(int fd, const void *buf, unsigned n) } if (!ret) die("write error (disk full?)"); - if (errno == EAGAIN || errno == EINTR) - continue; die("write error (%s)", strerror(errno)); } } @@ -68,12 +66,9 @@ static void safe_read(int fd, void *buffer, unsigned size) int n = 0; while (n < size) { - int ret = read(fd, buffer + n, size - n); - if (ret < 0) { - if (errno == EINTR || errno == EAGAIN) - continue; + int ret = xread(fd, buffer + n, size - n); + if (ret < 0) die("read error (%s)", strerror(errno)); - } if (!ret) die("unexpected EOF"); n += ret;