Cleanup: move read_data function to libtar

Its the only user. The other code doesn't touch raw file
descriptors anymore.

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

1 files changed, 37 insertions, 0 deletions

diff --git a/lib/tar/read_retry.c b/lib/tar/read_retry.c
new file mode 100644
index 0000000..5d06595
--- /dev/null
+++ b/lib/tar/read_retry.c
@@ -0,0 +1,37 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+/*
+ * read_retry.c
+ *
+ * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
+ */
+#include "config.h"
+
+#include <unistd.h>
+#include <errno.h>
+#include <stdio.h>
+
+#include "tar.h"
+
+int read_retry(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;
+}