diff options
Diffstat (limited to 'lib/util')
-rw-r--r-- | lib/util/Makemodule.am | 2 | ||||
-rw-r--r-- | lib/util/read_data_at.c | 39 |
2 files changed, 1 insertions, 40 deletions
diff --git a/lib/util/Makemodule.am b/lib/util/Makemodule.am index 2692c01..1d77fd5 100644 --- a/lib/util/Makemodule.am +++ b/lib/util/Makemodule.am @@ -3,7 +3,7 @@ libutil_la_SOURCES += lib/util/read_data.c include/util.h libutil_la_SOURCES += lib/util/mkdir_p.c libutil_la_SOURCES += lib/util/str_table.c include/str_table.h libutil_la_SOURCES += lib/util/dirstack.c lib/util/padd_file.c -libutil_la_SOURCES += lib/util/read_data_at.c lib/util/alloc.c +libutil_la_SOURCES += lib/util/alloc.c libutil_la_SOURCES += lib/util/canonicalize_name.c libutil_la_CFLAGS = $(AM_CFLAGS) libutil_la_CPPFLAGS = $(AM_CPPFLAGS) diff --git a/lib/util/read_data_at.c b/lib/util/read_data_at.c deleted file mode 100644 index 058909a..0000000 --- a/lib/util/read_data_at.c +++ /dev/null @@ -1,39 +0,0 @@ -/* SPDX-License-Identifier: LGPL-3.0-or-later */ -/* - * read_data_at.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_at(const char *errstr, off_t location, int fd, - void *buffer, size_t size) -{ - ssize_t ret; - - while (size > 0) { - ret = pread(fd, buffer, size, location); - 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; - location += ret; - } - - return 0; -} |