From 9b43890591da92497a104490efd4e63157cb7c53 Mon Sep 17 00:00:00 2001
From: David Oberhollenzer <goliath@infraroot.at>
Date: Mon, 6 Apr 2020 15:44:15 +0200
Subject: [PATCH] cleanup: simplify runsvc environment config parsing

Signed-off-by: David Oberhollenzer <goliath@infraroot.at>
---
 cmd/Makemodule.am         |   2 +-
 cmd/{runsvc => }/runsvc.c |  58 +++++++++++++++++++-
 cmd/runsvc/env.c          | 109 --------------------------------------
 cmd/runsvc/runsvc.h       |  23 --------
 4 files changed, 57 insertions(+), 135 deletions(-)
 rename cmd/{runsvc => }/runsvc.c (70%)
 delete mode 100644 cmd/runsvc/env.c
 delete mode 100644 cmd/runsvc/runsvc.h

diff --git a/cmd/Makemodule.am b/cmd/Makemodule.am
index 0af619f..4011b6c 100644
--- a/cmd/Makemodule.am
+++ b/cmd/Makemodule.am
@@ -3,7 +3,7 @@ shutdown_CPPFLAGS = $(AM_CPPFLAGS)
 shutdown_CFLAGS = $(AM_CFLAGS)
 shutdown_LDFLAGS = $(AM_LDFLAGS)
 
-runsvc_SOURCES = cmd/runsvc/runsvc.c cmd/runsvc/env.c cmd/runsvc/runsvc.h
+runsvc_SOURCES = cmd/runsvc.c
 runsvc_CPPFLAGS = $(AM_CPPFLAGS)
 runsvc_CFLAGS = $(AM_CFLAGS)
 runsvc_LDFLAGS = $(AM_LDFLAGS)
diff --git a/cmd/runsvc/runsvc.c b/cmd/runsvc.c
similarity index 70%
rename from cmd/runsvc/runsvc.c
rename to cmd/runsvc.c
index 75fdc46..db2de5b 100644
--- a/cmd/runsvc/runsvc.c
+++ b/cmd/runsvc.c
@@ -1,5 +1,59 @@
 /* SPDX-License-Identifier: ISC */
-#include "runsvc.h"
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <errno.h>
+
+#include "service.h"
+#include "libcfg.h"
+#include "config.h"
+
+#define ENVFILE ETCPATH "/initd.env"
+
+static int setup_env(void)
+{
+	int status = -1;
+	ssize_t ret;
+	FILE *fp;
+
+	clearenv();
+
+	fp = fopen(ENVFILE, "r");
+	if (fp == NULL) {
+		perror(ENVFILE);
+		return -1;
+	}
+
+	do {
+		char *line = NULL;
+		size_t n = 0;
+
+		errno = 0;
+		ret = getline(&line, &n, fp);
+
+		if (ret < 0) {
+			if (errno == 0) {
+				status = 0;
+			} else {
+				perror(ENVFILE);
+			}
+		} else if (ret > 0 && putenv(line) != 0) {
+			perror("putenv");
+			ret = -1;
+		}
+
+		free(line);
+	} while (ret >= 0);
+
+	fclose(fp);
+	return status;
+}
 
 static int setup_tty(const char *tty, bool truncate)
 {
@@ -105,7 +159,7 @@ int main(int argc, char **argv)
 	if (svc == NULL)
 		return EXIT_FAILURE;
 
-	if (initenv())
+	if (setup_env())
 		return EXIT_FAILURE;
 
 	if (setup_tty(svc->ctty, (svc->flags & SVC_FLAG_TRUNCATE_OUT) != 0))
diff --git a/cmd/runsvc/env.c b/cmd/runsvc/env.c
deleted file mode 100644
index 4442e05..0000000
--- a/cmd/runsvc/env.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/* SPDX-License-Identifier: ISC */
-#include "runsvc.h"
-
-struct entry {
-	struct entry *next;
-	char data[];
-};
-
-extern char **environ;
-
-static void free_list(struct entry *list)
-{
-	struct entry *e;
-
-	while (list != NULL) {
-		e = list;
-		list = list->next;
-		free(e);
-	}
-}
-
-static struct entry *parse_list(rdline_t *rd)
-{
-	struct entry *e, *list = NULL;
-	char *ptr;
-
-	while (rdline(rd) == 0) {
-		ptr = rd->line;
-
-		while (*ptr != '\0' && *ptr != ' ' && *ptr != '=')
-			++ptr;
-
-		if (*ptr == ' ')
-			memmove(ptr, ptr + 1, strlen(ptr + 1) + 1);
-
-		if (*(ptr++) != '=') {
-			fprintf(stderr, "%s: %zu: line is not of the shape "
-					"'key = value', skipping\n",
-				rd->filename, rd->lineno);
-			continue;
-		}
-
-		if (*ptr == ' ')
-			memmove(ptr, ptr + 1, strlen(ptr + 1) + 1);
-
-		if (unescape(ptr)) {
-			fprintf(stderr, "%s: %zu: malformed string constant, "
-					"skipping\n",
-				rd->filename, rd->lineno);
-			continue;
-		}
-
-		e = calloc(1, sizeof(*e) + strlen(rd->line) + 1);
-		if (e == NULL)
-			goto fail_oom;
-
-		strcpy(e->data, rd->line);
-		e->next = list;
-		list = e;
-	}
-
-	return list;
-fail_oom:
-	fputs("out of memory\n", stderr);
-	free_list(list);
-	return NULL;
-}
-
-static struct entry *list_from_file(void)
-{
-	struct entry *list;
-	rdline_t rd;
-
-	if (rdline_init(&rd, AT_FDCWD, ENVFILE, 0, NULL))
-		return NULL;
-
-	list = parse_list(&rd);
-	rdline_cleanup(&rd);
-	return list;
-}
-
-int initenv(void)
-{
-	struct entry *list, *e;
-	int i, count;
-	char **envp;
-
-	list = list_from_file();
-	if (list == NULL)
-		return -1;
-
-	for (count = 0, e = list; e != NULL; e = e->next)
-		++count;
-
-	envp = malloc((count + 1) * sizeof(char *));
-	if (envp == NULL) {
-		fputs("out of memory\n", stderr);
-		free_list(list);
-		return -1;
-	}
-
-	for (i = 0, e = list; e != NULL; e = e->next)
-		envp[i] = e->data;
-
-	envp[i] = NULL;
-
-	environ = envp;
-	return 0;
-}
diff --git a/cmd/runsvc/runsvc.h b/cmd/runsvc/runsvc.h
deleted file mode 100644
index 2a6ae49..0000000
--- a/cmd/runsvc/runsvc.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* SPDX-License-Identifier: ISC */
-#ifndef RUNSVC_H
-#define RUNSVC_H
-
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <fcntl.h>
-
-#include "service.h"
-#include "libcfg.h"
-#include "config.h"
-
-#define ENVFILE ETCPATH "/initd.env"
-
-int initenv(void);
-
-#endif /* RUNSVC_H */