summaryrefslogtreecommitdiff
path: root/lib/src
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@tele2.at>2018-05-23 22:26:17 +0200
committerDavid Oberhollenzer <david.oberhollenzer@tele2.at>2018-06-09 15:32:29 +0200
commitbf63f78b6698f33ed3acbd4aed8822a35688c1ba (patch)
tree4e7c79326dd6fd217f135234dbcf3d9bc09ebb82 /lib/src
parent1eb8a4c792166360137cb5c83afa75eace2b4b1d (diff)
Split configuration parser and utility library
Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>
Diffstat (limited to 'lib/src')
-rw-r--r--lib/src/del_svc_list.c35
-rw-r--r--lib/src/delsvc.c43
-rw-r--r--lib/src/enum_by_name.c32
-rw-r--r--lib/src/enum_to_name.c32
-rw-r--r--lib/src/opensock.c50
-rw-r--r--lib/src/rdline.c174
-rw-r--r--lib/src/rdsvc.c356
-rw-r--r--lib/src/split_argv.c82
-rw-r--r--lib/src/svc_tsort.c95
-rw-r--r--lib/src/svcmap.c58
-rw-r--r--lib/src/svcscan.c110
-rw-r--r--lib/src/unescape.c94
12 files changed, 0 insertions, 1161 deletions
diff --git a/lib/src/del_svc_list.c b/lib/src/del_svc_list.c
deleted file mode 100644
index 553a701..0000000
--- a/lib/src/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/src/delsvc.c b/lib/src/delsvc.c
deleted file mode 100644
index 9ab51f1..0000000
--- a/lib/src/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/src/enum_by_name.c b/lib/src/enum_by_name.c
deleted file mode 100644
index 95f306f..0000000
--- a/lib/src/enum_by_name.c
+++ /dev/null
@@ -1,32 +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 <string.h>
-
-#include "util.h"
-
-const enum_map_t *enum_by_name(const enum_map_t *map, const char *name)
-{
- size_t i;
-
- for (i = 0; map[i].name != NULL; ++i) {
- if (!strcmp(map[i].name, name))
- return map + i;
- }
-
- return NULL;
-}
diff --git a/lib/src/enum_to_name.c b/lib/src/enum_to_name.c
deleted file mode 100644
index 43fd4dc..0000000
--- a/lib/src/enum_to_name.c
+++ /dev/null
@@ -1,32 +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 <string.h>
-
-#include "util.h"
-
-const char *enum_to_name(const enum_map_t *map, int value)
-{
- size_t i;
-
- for (i = 0; map[i].name != NULL; ++i) {
- if (map[i].value == value)
- return map[i].name;
- }
-
- return NULL;
-}
diff --git a/lib/src/opensock.c b/lib/src/opensock.c
deleted file mode 100644
index 0c2bf56..0000000
--- a/lib/src/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/src/rdline.c b/lib/src/rdline.c
deleted file mode 100644
index 47a9d2a..0000000
--- a/lib/src/rdline.c
+++ /dev/null
@@ -1,174 +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 <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <ctype.h>
-#include <stdio.h>
-
-#include "util.h"
-
-static int rdline_getc(rdline_t *t)
-{
- int ret;
- char c;
-
- if (t->argstr != NULL) {
- c = *(t->argstr++);
- if (c != '\0')
- goto out;
-
- t->argstr = NULL;
- }
-
- do {
- ret = read(t->fd, &c, 1);
- } while (ret < 0 && errno == EINTR);
-
- if (ret < 0)
- return -1;
-
- if (ret == 0) {
- if (t->i == 0) {
- errno = 0;
- return -1;
- }
- c = '\0';
- }
-out:
- return (c == '\n') ? '\0' : c;
-}
-
-static int rdline_append(rdline_t *t, int c)
-{
- if (t->comment) {
- if (c != '\0')
- return 0;
- } else if (t->string) {
- if (t->escape) {
- t->escape = false;
- } else {
- if (c == '\\')
- t->escape = true;
- if (c == '"')
- t->string = false;
- }
- } else {
- if (isspace(c))
- c = ' ';
- if (c == ' ' && (t->i == 0 || t->buffer[t->i - 1] == ' '))
- return 0;
- if (c == '#') {
- t->comment = true;
- return 0;
- }
- if (c == '"')
- t->string = true;
- }
-
- if (c == '\0') {
- while (t->i > 0 && t->buffer[t->i - 1] == ' ')
- t->i -= 1;
- }
-
- if (t->i == sizeof(t->buffer))
- return -1;
-
- t->buffer[t->i++] = c;
- return 0;
-}
-
-void rdline_init(rdline_t *t, int fd, const char *filename,
- int argc, const char *const *argv)
-{
- memset(t, 0, sizeof(*t));
- t->fd = fd;
- t->filename = filename;
- t->argc = argc;
- t->argv = argv;
-}
-
-int rdline(rdline_t *t)
-{
- const char *errstr;
- int c;
-retry:
- t->i = 0;
- t->argstr = NULL;
- t->string = t->escape = t->comment = false;
- t->lineno += 1;
-
- do {
- errno = 0;
- c = rdline_getc(t);
- if (c < 0) {
- if (errno == 0)
- return 1;
- errstr = strerror(errno);
- goto fail;
- }
- if (c == 0 && t->string) {
- errstr = "missing \"";
- goto fail;
- }
-
- if (c == '%') {
- c = rdline_getc(t);
- if (c == 0) {
- errstr = "unexpected end of line after '%%'";
- goto fail;
- }
- if (c < 0) {
- errstr = strerror(errno);
- goto fail;
- }
-
- if (c != '%') {
- if (!isdigit(c)) {
- errstr = "exptected digit after '%%'";
- goto fail;
- }
- if ((c - '0') >= t->argc) {
- errstr = "argument out of range";
- goto fail;
- }
- if (t->argstr != NULL) {
- errstr = "recursive argument "
- "expansion";
- goto fail;
- }
- t->argstr = t->argv[c - '0'];
- continue;
- }
- }
-
- if (rdline_append(t, c)) {
- errstr = "line too long";
- goto fail;
- }
- } while (c != '\0');
-
- if (t->buffer[0] == '\0')
- goto retry;
-
- return 0;
-fail:
- fprintf(stderr, "%s: %zu: %s\n", t->filename, t->lineno, errstr);
- return -1;
-}
diff --git a/lib/src/rdsvc.c b/lib/src/rdsvc.c
deleted file mode 100644
index 546962d..0000000
--- a/lib/src/rdsvc.c
+++ /dev/null
@@ -1,356 +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 "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(service_t *svc, char *arg, rdline_t *rd)
-{
- if (try_unescape(arg, rd))
- return -1;
- svc->desc = try_strdup(arg, rd);
- return svc->desc == NULL ? -1 : 0;
-}
-
-static int svc_tty(service_t *svc, char *arg, rdline_t *rd)
-{
- if (try_unescape(arg, rd))
- return -1;
- svc->ctty = try_strdup(arg, rd);
- return svc->ctty == NULL ? -1 : 0;
-}
-
-static int svc_exec(service_t *svc, char *arg, rdline_t *rd)
-{
- exec_t *e, *end;
-
- 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(service_t *svc, char *arg, rdline_t *rd)
-{
- 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(service_t *svc, char *arg, rdline_t *rd)
-{
- 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(service_t *svc, char *arg, rdline_t *rd)
-{
- int count = try_pack_argv(arg, rd);
-
- 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(service_t *svc, char *arg, rdline_t *rd)
-{
- int target;
-
- 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 struct svc_param {
- const char *key;
-
- unsigned int allow_block : 1;
-
- int flags;
-
- int (*handle)(service_t *svc, char *arg, rdline_t *rd);
-} svc_params[] = {
- { "description", 0, 0, svc_desc },
- { "exec", 1, RDSVC_NO_EXEC, svc_exec },
- { "type", 0, 0, svc_type },
- { "target", 0, 0, svc_target },
- { "tty", 0, RDSVC_NO_CTTY, svc_tty },
- { "before", 0, RDSVC_NO_DEPS, svc_before },
- { "after", 0, RDSVC_NO_DEPS, svc_after },
-};
-
-static int splitkv(rdline_t *rd, char **k, char **v)
-{
- char *key = rd->buffer, *value = rd->buffer;
-
- while (*value != ' ' && *value != '\0') {
- if (!isalpha(*value)) {
- fprintf(stderr,
- "%s: %zu: unexpected '%c' in keyword\n",
- rd->filename, rd->lineno, *value);
- return -1;
- }
- ++value;
- }
-
- if (*value != ' ') {
- fprintf(stderr, "%s: %zu: expected argument after '%s'\n",
- rd->filename, rd->lineno, key);
- return -1;
- }
-
- *(value++) = '\0';
-
- *k = key;
- *v = value;
- return 0;
-}
-
-static const struct svc_param *find_param(rdline_t *rd, const char *name)
-{
- size_t i;
-
- for (i = 0; i < ARRAY_SIZE(svc_params); ++i) {
- if (!strcmp(svc_params[i].key, name))
- return svc_params + i;
- }
-
- fprintf(stderr, "%s: %zu: unknown keyword '%s'\n",
- rd->filename, rd->lineno, name);
- return NULL;
-}
-
-
-service_t *rdsvc(int dirfd, const char *filename, int flags)
-{
- const struct svc_param *p;
- const char *arg, *args[1];
- service_t *svc = NULL;
- char *key, *value;
- size_t argc, nlen;
- rdline_t rd;
- int fd, ret;
-
- 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;
- }
-
- rdline_init(&rd, fd, filename, argc, args);
-
- 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);
-
- while ((ret = rdline(&rd)) == 0) {
- if (splitkv(&rd, &key, &value))
- goto fail;
-
- p = find_param(&rd, key);
- if (p == NULL)
- goto fail;
-
- if (p->allow_block && *value == '{') {
- for (++value; *value == ' '; ++value)
- ;
-
- if (!(flags & p->flags)) {
- if (*value != '\0' &&
- p->handle(svc, value, &rd)) {
- goto fail;
- }
- }
-
- while ((ret = rdline(&rd)) == 0) {
- if (strcmp(rd.buffer, "}") == 0)
- break;
- if (flags & p->flags)
- continue;
- if (p->handle(svc, rd.buffer, &rd))
- goto fail;
- }
-
- if (ret < 0)
- goto fail;
- if (ret > 0)
- goto fail_bra;
- } else {
- if (flags & p->flags)
- continue;
- if (p->handle(svc, value, &rd))
- goto fail;
- }
- }
-
- if (ret < 0)
- goto fail;
-
- close(fd);
- return svc;
-fail_bra:
- fprintf(stderr, "%s: missing '}' before end-of-file\n", filename);
- goto fail;
-fail_oom:
- fputs("out of memory\n", stderr);
-fail:
- delsvc(svc);
- close(fd);
- return NULL;
-}
diff --git a/lib/src/split_argv.c b/lib/src/split_argv.c
deleted file mode 100644
index 5930e2d..0000000
--- a/lib/src/split_argv.c
+++ /dev/null
@@ -1,82 +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 <string.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-
-#include "util.h"
-
-int pack_argv(char *str)
-{
- char *dst, *start;
- int count = 0;
-
- dst = str;
-
- for (;;) {
- while (*str == ' ')
- ++str;
-
- if (*str == '\0')
- break;
-
- if (*str == '"') {
- start = dst;
- *(dst++) = *(str++);
-
- while (*str != '"') {
- if (*str == '\0')
- goto fail_str;
- if (str[0] == '\\' && str[1] != '\0')
- *(dst++) = *(str++);
- *(dst++) = *(str++);
- }
-
- *(dst++) = *(str++);
-
- if (*str != ' ' && *str != '\0')
- goto fail_str;
- if (*str == ' ')
- ++str;
-
- *(dst++) = '\0';
-
- if (unescape(start))
- goto fail_str;
-
- dst = start + strlen(start) + 1;
- } else {
- while (*str != '\0' && *str != ' ')
- *(dst++) = *(str++);
- if (*str == ' ') {
- ++str;
- *(dst++) = '\0';
- }
- }
-
- ++count;
- }
-
- *dst = '\0';
- return count;
-fail_str:
- errno = EINVAL;
- return -1;
-}
diff --git a/lib/src/svc_tsort.c b/lib/src/svc_tsort.c
deleted file mode 100644
index 5f83fa0..0000000
--- a/lib/src/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/src/svcmap.c b/lib/src/svcmap.c
deleted file mode 100644
index 5df8ca9..0000000
--- a/lib/src/svcmap.c
+++ /dev/null
@@ -1,58 +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 },
- { "ctrlaltdel", TGT_CAD },
- { 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/src/svcscan.c b/lib/src/svcscan.c
deleted file mode 100644
index f4c7ef1..0000000
--- a/lib/src/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;
-}
diff --git a/lib/src/unescape.c b/lib/src/unescape.c
deleted file mode 100644
index 2d48c92..0000000
--- a/lib/src/unescape.c
+++ /dev/null
@@ -1,94 +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 <ctype.h>
-#include <errno.h>
-
-#include "util.h"
-
-static int xdigit(int x)
-{
- if (isupper(x))
- return x - 'A' + 0x0A;
- if (islower(x))
- return x - 'a' + 0x0A;
- return x - '0';
-}
-
-int unescape(char *src)
-{
- char *dst = src;
- int c;
-
- for (;;) {
- while (*src != '"' && *src != '\0')
- *(dst++) = *(src++);
-
- if (*src == '\0')
- break;
-
- ++src;
-
- while ((c = *(src++)) != '"') {
- if (c == '\0')
- return -1;
-
- if (c == '\\') {
- c = *(src++);
-
- switch (c) {
- case 'a': c = '\a'; break;
- case 'b': c = '\b'; break;
- case 'f': c = '\f'; break;
- case 'n': c = '\n'; break;
- case 't': c = '\t'; break;
- case '\\':
- case '"':
- case '%':
- break;
- case 'x':
- c = 0;
- if (isxdigit(*src))
- c = (c<<4) | xdigit(*(src++));
- if (isxdigit(*src))
- c = (c<<4) | xdigit(*(src++));
- break;
- case '0':
- c = 0;
- if (isdigit(*src) && *src < '8')
- c = (c<<3) | (*(src++) - '0');
- if (isdigit(*src) && *src < '8')
- c = (c<<3) | (*(src++) - '0');
- if (isdigit(*src) && *src < '8')
- c = (c<<3) | (*(src++) - '0');
- break;
- default:
- return -1;
- }
-
- if (c == 0)
- return -1;
- }
-
- *(dst++) = c;
- }
- }
-
- *(dst++) = '\0';
- return 0;
-}