From 10b4195af24561c8d4a39b27c31cde21eb1cf1b9 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Wed, 3 Apr 2019 23:41:09 +0200 Subject: Replace rdline with libbsd fparseln Signed-off-by: David Oberhollenzer --- rdline.c | 77 ---------------------------------------------------------------- 1 file changed, 77 deletions(-) delete mode 100644 rdline.c (limited to 'rdline.c') diff --git a/rdline.c b/rdline.c deleted file mode 100644 index 99b4f4e..0000000 --- a/rdline.c +++ /dev/null @@ -1,77 +0,0 @@ -/* SPDX-License-Identifier: ISC */ -#include "gcrond.h" - -int rdline(rdline_t *t) -{ - size_t i, len; - - do { - free(t->line); - t->line = NULL; - errno = 0; - len = 0; - - if (getline(&t->line, &len, t->fp) < 0) { - if (errno) { - rdline_complain(t, strerror(errno)); - return -1; - } - return 1; - } - - t->lineno += 1; - - for (i = 0; isspace(t->line[i]); ++i) - ; - - if (t->line[i] == '\0' || t->line[i] == '#') { - t->line[0] = '\0'; - } else if (i) { - memmove(t->line, t->line + i, len - i + 1); - } - } while (t->line[0] == '\0'); - - return 0; -} - -void rdline_complain(rdline_t *t, const char *msg, ...) -{ - va_list ap; - - fprintf(stderr, "%s: %zu: ", t->filename, t->lineno); - - va_start(ap, msg); - vfprintf(stderr, msg, ap); - va_end(ap); - - fputc('\n', stderr); -} - -int rdline_init(rdline_t *t, int dirfd, const char *filename) -{ - int fd; - - memset(t, 0, sizeof(*t)); - - fd = openat(dirfd, filename, O_RDONLY); - if (fd == -1) { - perror(filename); - return -1; - } - - t->fp = fdopen(fd, "r"); - if (t->fp == NULL) { - perror("fdopen"); - close(fd); - return -1; - } - - t->filename = filename; - return 0; -} - -void rdline_cleanup(rdline_t *t) -{ - free(t->line); - fclose(t->fp); -} -- cgit v1.2.3