From c0e8c7e245c09598478302155b37a15f3370571f Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Sun, 4 Nov 2018 15:02:11 +0100 Subject: cleanup: let rdline_init open the file Signed-off-by: David Oberhollenzer --- cmd/runsvc/env.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'cmd/runsvc') diff --git a/cmd/runsvc/env.c b/cmd/runsvc/env.c index 1e73ee4..e58d803 100644 --- a/cmd/runsvc/env.c +++ b/cmd/runsvc/env.c @@ -86,17 +86,12 @@ static struct entry *list_from_file(void) { struct entry *list; rdline_t rd; - int fd; - fd = open(ENVFILE, O_RDONLY); - if (fd < 0) { - perror(ENVFILE); + if (rdline_init(&rd, AT_FDCWD, ENVFILE, 0, NULL)) return NULL; - } - rdline_init(&rd, fd, ENVFILE, 0, NULL); list = parse_list(&rd); - close(fd); + rdline_cleanup(&rd); return list; } -- cgit v1.2.3