From d9a5736bdfa9db29e94c5431bb8a9bc92a24585c Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Fri, 23 Nov 2018 14:13:52 +0100 Subject: Remove some no longer needed cruft Signed-off-by: David Oberhollenzer --- lib/libcfg/rdline.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'lib/libcfg') diff --git a/lib/libcfg/rdline.c b/lib/libcfg/rdline.c index ab7b101..ee9ee8b 100644 --- a/lib/libcfg/rdline.c +++ b/lib/libcfg/rdline.c @@ -5,6 +5,7 @@ #include #include #include +#include #include "libcfg.h" #include "util.h" @@ -12,18 +13,26 @@ int rdline_init(rdline_t *t, int dirfd, const char *filename, int argc, const char *const *argv) { + int fd = openat(dirfd, filename, O_RDONLY); + + if (fd == -1) + goto fail_open; + memset(t, 0, sizeof(*t)); - t->fp = fopenat(dirfd, filename, "r"); + t->fp = fdopen(fd, "r"); if (t->fp == NULL) { - perror(filename); - return -1; + close(fd); + goto fail_open; } t->filename = filename; t->argc = argc; t->argv = argv; return 0; +fail_open: + perror(filename); + return -1; } void rdline_cleanup(rdline_t *t) -- cgit v1.2.3