aboutsummaryrefslogtreecommitdiff
path: root/lib/util
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-10-07 14:53:50 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-10-07 14:56:27 +0200
commit7e1be3986b3b8229f0162431b6e02c24e04a5dba (patch)
treef427b88a1b5edb35232e0aa72fb7d19b4728cbcd /lib/util
parent267d5318e1cbf69a071b5188dda50310af2f2f8b (diff)
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>
Diffstat (limited to 'lib/util')
-rw-r--r--lib/util/Makemodule.am3
-rw-r--r--lib/util/read_data.c37
2 files changed, 1 insertions, 39 deletions
diff --git a/lib/util/Makemodule.am b/lib/util/Makemodule.am
index 1ae931b..5ba82bc 100644
--- a/lib/util/Makemodule.am
+++ b/lib/util/Makemodule.am
@@ -1,5 +1,4 @@
-libutil_la_SOURCES = lib/util/write_data.c
-libutil_la_SOURCES += lib/util/read_data.c include/util.h
+libutil_la_SOURCES = lib/util/write_data.c include/util.h
libutil_la_SOURCES += lib/util/mkdir_p.c include/compat.h
libutil_la_SOURCES += lib/util/str_table.c include/str_table.h
libutil_la_SOURCES += lib/util/dirstack.c lib/util/alloc.c
diff --git a/lib/util/read_data.c b/lib/util/read_data.c
deleted file mode 100644
index f35d579..0000000
--- a/lib/util/read_data.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* SPDX-License-Identifier: LGPL-3.0-or-later */
-/*
- * read_data.c
- *
- * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
- */
-#include "config.h"
-
-#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;
-}