diff options
Diffstat (limited to 'lib/util')
-rw-r--r-- | lib/util/read_data.c (renamed from lib/util/read_retry.c) | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/lib/util/read_retry.c b/lib/util/read_data.c index eb113c4..43f8da8 100644 --- a/lib/util/read_retry.c +++ b/lib/util/read_data.c @@ -1,27 +1,30 @@ /* SPDX-License-Identifier: GPL-3.0-or-later */ #include <unistd.h> #include <errno.h> +#include <stdio.h> #include "util.h" -ssize_t read_retry(int fd, void *buffer, size_t size) +int read_data(const char *errstr, int fd, void *buffer, size_t size) { - ssize_t ret, total = 0; + ssize_t ret; while (size > 0) { ret = read(fd, buffer, size); if (ret < 0) { if (errno == EINTR) continue; + perror(errstr); + return -1; + } + if (ret == 0) { + fprintf(stderr, "%s: short read\n", errstr); return -1; } - if (ret == 0) - break; - total += ret; size -= ret; buffer = (char *)buffer + ret; } - return total; + return 0; } |