X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=pkt-line.c;h=f5d00863a6234c16db33637d19fefd2014780e87;hb=03af0870a0e6d551a31eb830d5c2682b82ae0ac6;hp=355546a1ad844492234dc7ee91528c525af5610a;hpb=cab31fa076253fcfafa7572c24e40f12a1e09ae3;p=git.git diff --git a/pkt-line.c b/pkt-line.c index 355546a1a..f5d00863a 100644 --- a/pkt-line.c +++ b/pkt-line.c @@ -65,16 +65,11 @@ void packet_write(int fd, const char *fmt, ...) static void safe_read(int fd, void *buffer, unsigned size) { - size_t n = 0; - - while (n < size) { - ssize_t ret = xread(fd, (char *) buffer + n, size - n); - if (ret < 0) - die("read error (%s)", strerror(errno)); - if (!ret) - die("The remote end hung up unexpectedly"); - n += ret; - } + ssize_t ret = read_in_full(fd, buffer, size); + if (ret < 0) + die("read error (%s)", strerror(errno)); + else if (ret < size) + die("The remote end hung up unexpectedly"); } int packet_read_line(int fd, char *buffer, unsigned size)