cleanup: move error handling into read_retry

If read_retry fails to read the expected amount of data (EOF or otherwise),
it is almost always an error.

This commit renames read_retry to read_data and moves error handling
into the function, making a lot of error handling code redundant.

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>

1 files changed, 30 insertions, 0 deletions

diff --git a/lib/util/read_data.c b/lib/util/read_data.c
new file mode 100644
index 0000000..43f8da8
--- /dev/null
+++ b/lib/util/read_data.c
@@ -0,0 +1,30 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+#include <unistd.h>
+#include <errno.h>
+#include <stdio.h>
+
+#include "util.h"
+
+int read_data(const char *errstr, int fd, void *buffer, size_t size)
+{
+	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;
+		}
+
+		size -= ret;
+		buffer = (char *)buffer + ret;
+	}
+
+	return 0;
+}