Seperate init specific code from utility code

Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>

7 files changed, 0 insertions, 687 deletions

diff --git a/lib/util/del_svc_list.c b/lib/util/del_svc_list.c
deleted file mode 100644
index 553a701..0000000
--- a/lib/util/del_svc_list.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* SPDX-License-Identifier: GPL-3.0-or-later */
-/*
- * Copyright (C) 2018 - David Oberhollenzer
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-#include <stdlib.h>
-
-#include "service.h"
-
-void del_svc_list(service_list_t *list)
-{
-	service_t *svc;
-	int i;
-
-	for (i = 0; i < TGT_MAX; ++i) {
-		while (list->targets[i] != NULL) {
-			svc = list->targets[i];
-			list->targets[i] = svc->next;
-
-			delsvc(svc);
-		}
-	}
-}
diff --git a/lib/util/delsvc.c b/lib/util/delsvc.c
deleted file mode 100644
index 9ab51f1..0000000
--- a/lib/util/delsvc.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* SPDX-License-Identifier: GPL-3.0-or-later */
-/*
- * Copyright (C) 2018 - David Oberhollenzer
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-#include <stdlib.h>
-
-#include "service.h"
-
-void delsvc(service_t *svc)
-{
-	exec_t *e;
-
-	if (svc == NULL)
-		return;
-
-	while (svc->exec != NULL) {
-		e = svc->exec;
-		svc->exec = e->next;
-
-		free(e);
-	}
-
-	free(svc->before);
-	free(svc->after);
-	free(svc->fname);
-	free(svc->desc);
-	free(svc->exec);
-	free(svc->ctty);
-	free(svc);
-}
diff --git a/lib/util/opensock.c b/lib/util/opensock.c
deleted file mode 100644
index 0c2bf56..0000000
--- a/lib/util/opensock.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* SPDX-License-Identifier: GPL-3.0-or-later */
-/*
- * Copyright (C) 2018 - David Oberhollenzer
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdio.h>
-
-#include "telinit.h"
-
-int opensock(void)
-{
-	struct sockaddr_un un;
-	int fd;
-
-	fd = socket(AF_UNIX, SOCK_STREAM, 0);
-	if (fd < 0) {
-		perror("socket");
-		return -1;
-	}
-
-	memset(&un, 0, sizeof(un));
-	un.sun_family = AF_UNIX;
-
-	strcpy(un.sun_path, INITSOCK);
-
-	if (connect(fd, (struct sockaddr *)&un, sizeof(un))) {
-		perror("connect: " INITSOCK);
-		close(fd);
-		return -1;
-	}
-
-	return fd;
-}
diff --git a/lib/util/rdsvc.c b/lib/util/rdsvc.c
deleted file mode 100644
index ca60731..0000000
--- a/lib/util/rdsvc.c
+++ /dev/null
@@ -1,297 +0,0 @@
-/* SPDX-License-Identifier: GPL-3.0-or-later */
-/*
- * Copyright (C) 2018 - David Oberhollenzer
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <ctype.h>
-
-#include "service.h"
-#include "libcfg.h"
-#include "util.h"
-
-static int try_unescape(char *arg, rdline_t *rd)
-{
-	if (unescape(arg)) {
-		fprintf(stderr, "%s: %zu: malformed string constant\n",
-			rd->filename, rd->lineno);
-		return -1;
-	}
-	return 0;
-}
-
-static char *try_strdup(const char *str, rdline_t *rd)
-{
-	char *out = strdup(str);
-
-	if (out == NULL) {
-		fprintf(stderr, "%s: %zu: out of memory\n",
-			rd->filename, rd->lineno);
-	}
-	return out;
-}
-
-static int try_pack_argv(char *str, rdline_t *rd)
-{
-	int count = pack_argv(str);
-	if (count < 0) {
-		fprintf(stderr, "%s: %zu: malformed string constant\n",
-			rd->filename, rd->lineno);
-	}
-	return count;
-}
-
-static int svc_desc(void *user, char *arg, rdline_t *rd, int flags)
-{
-	service_t *svc = user;
-	(void)flags;
-
-	if (try_unescape(arg, rd))
-		return -1;
-	svc->desc = try_strdup(arg, rd);
-	return svc->desc == NULL ? -1 : 0;
-}
-
-static int svc_tty(void *user, char *arg, rdline_t *rd, int flags)
-{
-	service_t *svc = user;
-
-	if (flags & RDSVC_NO_CTTY)
-		return 0;
-
-	if (strncmp(arg, "truncate", 8) == 0 && isspace(arg[8])) {
-		svc->flags |= SVC_FLAG_TRUNCATE_OUT;
-		arg += 8;
-		while (isspace(*arg))
-			++arg;
-	}
-
-	if (try_unescape(arg, rd))
-		return -1;
-
-	svc->ctty = try_strdup(arg, rd);
-	return svc->ctty == NULL ? -1 : 0;
-}
-
-static int svc_exec(void *user, char *arg, rdline_t *rd, int flags)
-{
-	service_t *svc = user;
-	exec_t *e, *end;
-
-	if (flags & RDSVC_NO_EXEC)
-		return 0;
-
-	e = calloc(1, sizeof(*e) + strlen(arg) + 1);
-	if (e == NULL) {
-		fprintf(stderr, "%s: %zu: out of memory\n",
-			rd->filename, rd->lineno);
-		return -1;
-	}
-
-	strcpy(e->args, arg);
-
-	e->argc = try_pack_argv(e->args, rd);
-	if (e->argc < 0)
-		return -1;
-
-	if (svc->exec == NULL) {
-		svc->exec = e;
-	} else {
-		for (end = svc->exec; end->next != NULL; end = end->next)
-			;
-		end->next = e;
-	}
-	return 0;
-}
-
-static int svc_before(void *user, char *arg, rdline_t *rd, int flags)
-{
-	service_t *svc = user;
-
-	if (flags & RDSVC_NO_DEPS)
-		return 0;
-
-	if (svc->before != NULL) {
-		fprintf(stderr, "%s: %zu: 'before' dependencies respecified\n",
-			rd->filename, rd->lineno);
-		return -1;
-	}
-
-	svc->before = try_strdup(arg, rd);
-	if (svc->before == NULL)
-		return -1;
-
-	svc->num_before = try_pack_argv(svc->before, rd);
-	return (svc->num_before < 0) ? -1 : 0;
-}
-
-static int svc_after(void *user, char *arg, rdline_t *rd, int flags)
-{
-	service_t *svc = user;
-
-	if (flags & RDSVC_NO_DEPS)
-		return 0;
-
-	if (svc->after != NULL) {
-		fprintf(stderr, "%s: %zu: 'after' dependencies respecified\n",
-			rd->filename, rd->lineno);
-		return -1;
-	}
-
-	svc->after = try_strdup(arg, rd);
-	if (svc->after == NULL)
-		return -1;
-
-	svc->num_after = try_pack_argv(svc->after, rd);
-	return (svc->num_after < 0) ? -1 : 0;
-}
-
-static int svc_type(void *user, char *arg, rdline_t *rd, int flags)
-{
-	service_t *svc = user;
-	int count = try_pack_argv(arg, rd);
-	(void)flags;
-
-	if (count < 1)
-		return -1;
-
-	svc->type = svc_type_from_string(arg);
-
-	if (svc->type == -1) {
-		fprintf(stderr, "%s: %zu: unknown service type '%s'\n",
-			rd->filename, rd->lineno, arg);
-		return -1;
-	}
-
-	if (count > 1) {
-		arg += strlen(arg) + 1;
-
-		switch (svc->type) {
-		case SVC_RESPAWN:
-			if (strcmp(arg, "limit") != 0)
-				goto fail_limit;
-			arg += strlen(arg) + 1;
-
-			if (count > 3)
-				goto fail_args;
-			if (!isdigit(*arg))
-				goto fail_limit;
-			svc->rspwn_limit = atoi(arg);
-			break;
-		default:
-			goto fail_args;
-		}
-	}
-
-	return 0;
-fail_args:
-	fprintf(stderr, "%s: %zu: unexpected extra arguments\n",
-		rd->filename, rd->lineno);
-	return -1;
-fail_limit:
-	fprintf(stderr, "%s: %zu: expected 'limit <value>' after 'respawn'\n",
-		rd->filename, rd->lineno);
-	return -1;
-}
-
-static int svc_target(void *user, char *arg, rdline_t *rd, int flags)
-{
-	service_t *svc = user;
-	int target;
-	(void)flags;
-
-	if (try_unescape(arg, rd))
-		return -1;
-
-	target = svc_target_from_string(arg);
-
-	if (target == -1) {
-		fprintf(stderr, "%s: %zu: unknown service target '%s'\n",
-			rd->filename, rd->lineno, arg);
-		return -1;
-	}
-
-	svc->target = target;
-	return 0;
-}
-
-static const cfg_param_t svc_params[] = {
-	{ "description", 0, svc_desc },
-	{ "exec", 1, svc_exec },
-	{ "type", 0, svc_type },
-	{ "target", 0, svc_target },
-	{ "tty", 0, svc_tty },
-	{ "before", 0, svc_before },
-	{ "after", 0, svc_after },
-};
-
-service_t *rdsvc(int dirfd, const char *filename, int flags)
-{
-	const char *arg, *args[1];
-	service_t *svc = NULL;
-	size_t argc, nlen;
-	rdline_t rd;
-	int fd;
-
-	fd = openat(dirfd, filename, O_RDONLY);
-	if (fd < 0) {
-		perror(filename);
-		return NULL;
-	}
-
-	arg = strchr(filename, '@');
-	if (arg != NULL) {
-		args[0] = arg + 1;
-		argc = 1;
-	} else {
-		argc = 0;
-	}
-
-	nlen = (arg != NULL) ? (size_t)(arg - filename) : strlen(filename);
-
-	svc = calloc(1, sizeof(*svc) + nlen + 1);
-	if (svc == NULL)
-		goto fail_oom;
-
-	if (!(flags & RDSVC_NO_FNAME)) {
-		svc->fname = strdup(filename);
-		if (svc->fname == NULL)
-			goto fail_oom;
-	}
-
-	memcpy(svc->name, filename, nlen);
-
-	rdline_init(&rd, fd, filename, argc, args);
-
-	if (rdcfg(svc, &rd, svc_params, ARRAY_SIZE(svc_params), flags)) {
-		delsvc(svc);
-		svc = NULL;
-	}
-
-	rdline_cleanup(&rd);
-	return svc;
-fail_oom:
-	fputs("out of memory\n", stderr);
-	delsvc(svc);
-	close(fd);
-	return NULL;
-}
diff --git a/lib/util/svc_tsort.c b/lib/util/svc_tsort.c
deleted file mode 100644
index 5f83fa0..0000000
--- a/lib/util/svc_tsort.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/* SPDX-License-Identifier: GPL-3.0-or-later */
-/*
- * Copyright (C) 2018 - David Oberhollenzer
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-#include <stdbool.h>
-#include <stddef.h>
-#include <string.h>
-#include <errno.h>
-
-#include "service.h"
-
-static bool has_dependencies(service_t *list, service_t *svc)
-{
-	const char *ptr;
-	int i;
-
-	while (list != NULL) {
-		for (ptr = svc->after, i = 0; i < svc->num_after; ++i) {
-			if (!strcmp(ptr, list->name))
-				return true;
-			ptr += strlen(ptr) + 1;
-		}
-
-		for (ptr = list->before, i = 0; i < list->num_before; ++i) {
-			if (!strcmp(ptr, svc->name))
-				return true;
-			ptr += strlen(ptr) + 1;
-		}
-
-		list = list->next;
-	}
-
-	return false;
-}
-
-service_t *svc_tsort(service_t *list)
-{
-	service_t *nl = NULL, *end = NULL;
-	service_t *svc, *prev;
-
-	while (list != NULL) {
-		/* remove first service without dependencies */
-		prev = NULL;
-		svc = list;
-
-		while (svc != NULL) {
-			if (has_dependencies(list, svc)) {
-				prev = svc;
-				svc = svc->next;
-			} else {
-				if (prev != NULL) {
-					prev->next = svc->next;
-				} else {
-					list = svc->next;
-				}
-				svc->next = NULL;
-				break;
-			}
-		}
-
-		/* cycle! */
-		if (svc == NULL) {
-			if (end == NULL) {
-				nl = list;
-			} else {
-				end->next = list;
-			}
-			errno = ELOOP;
-			break;
-		}
-
-		/* append to new list */
-		if (end == NULL) {
-			nl = end = svc;
-		} else {
-			end->next = svc;
-			end = svc;
-		}
-	}
-
-	return nl;
-}
diff --git a/lib/util/svcmap.c b/lib/util/svcmap.c
deleted file mode 100644
index 41fb950..0000000
--- a/lib/util/svcmap.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* SPDX-License-Identifier: GPL-3.0-or-later */
-/*
- * Copyright (C) 2018 - David Oberhollenzer
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-#include "service.h"
-#include "util.h"
-
-static const enum_map_t type_map[] = {
-	{ "once", SVC_ONCE },
-	{ "wait", SVC_WAIT },
-	{ "respawn", SVC_RESPAWN },
-	{ NULL, 0 },
-};
-
-static const enum_map_t target_map[] = {
-	{ "boot", TGT_BOOT },
-	{ "shutdown", TGT_SHUTDOWN },
-	{ "reboot", TGT_REBOOT },
-	{ NULL, 0 },
-};
-
-const char *svc_type_to_string(int type)
-{
-	return enum_to_name(type_map, type);
-}
-
-int svc_type_from_string(const char *type)
-{
-	const enum_map_t *ent = enum_by_name(type_map, type);
-
-	return ent == NULL ? -1 : ent->value;
-}
-
-const char *svc_target_to_string(int target)
-{
-	return enum_to_name(target_map, target);
-}
-
-int svc_target_from_string(const char *target)
-{
-	const enum_map_t *ent = enum_by_name(target_map, target);
-
-	return ent == NULL ? -1 : ent->value;
-}
diff --git a/lib/util/svcscan.c b/lib/util/svcscan.c
deleted file mode 100644
index f4c7ef1..0000000
--- a/lib/util/svcscan.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/* SPDX-License-Identifier: GPL-3.0-or-later */
-/*
- * Copyright (C) 2018 - David Oberhollenzer
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stddef.h>
-#include <dirent.h>
-#include <string.h>
-#include <errno.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <ctype.h>
-
-#include "service.h"
-
-int svcscan(const char *directory, service_list_t *list, int flags)
-{
-	int i, dfd, type, ret = 0;
-	struct dirent *ent;
-	const char *ptr;
-	service_t *svc;
-	struct stat sb;
-	DIR *dir;
-
-	for (i = 0; i < TGT_MAX; ++i)
-		list->targets[i] = NULL;
-
-	dir = opendir(directory);
-	if (dir == NULL) {
-		perror(directory);
-		return -1;
-	}
-
-	dfd = dirfd(dir);
-	if (dfd < 0) {
-		perror(directory);
-		closedir(dir);
-		return -1;
-	}
-
-	for (;;) {
-		errno = 0;
-		ent = readdir(dir);
-
-		if (ent == NULL) {
-			if (errno != 0) {
-				perror(directory);
-				ret = -1;
-			}
-			break;
-		}
-
-		for (ptr = ent->d_name; isalnum(*ptr) || *ptr == '_'; ++ptr)
-			;
-
-		if (*ptr != '\0' && *ptr != '@')
-			continue;
-
-		if (fstatat(dfd, ent->d_name, &sb, AT_SYMLINK_NOFOLLOW)) {
-			fprintf(stderr, "stat %s/%s: %s\n",
-				directory, ent->d_name, strerror(errno));
-			ret = -1;
-			continue;
-		}
-
-		type = (sb.st_mode & S_IFMT);
-
-		if (type != S_IFREG && type != S_IFLNK)
-			continue;
-
-		svc = rdsvc(dfd, ent->d_name, flags);
-		if (svc == NULL) {
-			ret = -1;
-			continue;
-		}
-
-		svc->next = list->targets[svc->target];
-		list->targets[svc->target] = svc;
-	}
-
-	for (i = 0; i < TGT_MAX; ++i) {
-		if (list->targets[i] == NULL)
-			continue;
-
-		errno = 0;
-		list->targets[i] = svc_tsort(list->targets[i]);
-
-		if (errno != 0) {
-			fprintf(stderr, "sorting services read from %s: %s\n",
-				directory, strerror(errno));
-		}
-	}
-
-	closedir(dir);
-	return ret;
-}