From 87a524d9313428d55e5a04c2538042629bdc467a Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Tue, 31 Mar 2020 18:19:27 +0200 Subject: cleanup: delete remains of libutil - exec_t belongs to service.h, the main place where it is used/needed - code for executing exec_t is moved to runsvc for the same reason - what is left are NORETURN and ARRAY_SIZE - the former can be replaced with direct attribute usage since the only relevant compilers all support the attribute. - the later is only used in 3 places and can be trivially replaced with direct usage of sizeof(). Signed-off-by: David Oberhollenzer --- cmd/runsvc/runsvc.c | 43 +++++++++++++++++++++++++++++++++++++++++++ cmd/runsvc/runsvc.h | 4 +++- 2 files changed, 46 insertions(+), 1 deletion(-) (limited to 'cmd/runsvc') diff --git a/cmd/runsvc/runsvc.c b/cmd/runsvc/runsvc.c index 794aa29..75fdc46 100644 --- a/cmd/runsvc/runsvc.c +++ b/cmd/runsvc/runsvc.c @@ -1,6 +1,49 @@ /* SPDX-License-Identifier: ISC */ #include "runsvc.h" +static int setup_tty(const char *tty, bool truncate) +{ + int fd; + + if (tty == NULL) + return 0; + + fd = open(tty, O_RDWR); + if (fd < 0) { + perror(tty); + return -1; + } + + if (truncate) + ftruncate(fd, 0); + + close(STDIN_FILENO); + close(STDOUT_FILENO); + close(STDERR_FILENO); + + setsid(); + + dup2(fd, STDIN_FILENO); + dup2(fd, STDOUT_FILENO); + dup2(fd, STDERR_FILENO); + close(fd); + return 0; +} + +static __attribute__((noreturn)) void argv_exec(exec_t *e) +{ + char **argv = alloca(sizeof(char *) * (e->argc + 1)), *ptr; + int i; + + for (ptr = e->args, i = 0; i < e->argc; ++i, ptr += strlen(ptr) + 1) + argv[i] = ptr; + + argv[i] = NULL; + execvp(argv[0], argv); + perror(argv[0]); + exit(EXIT_FAILURE); +} + static int run_sequentially(exec_t *list) { pid_t ret, pid; diff --git a/cmd/runsvc/runsvc.h b/cmd/runsvc/runsvc.h index 9f1a946..2a6ae49 100644 --- a/cmd/runsvc/runsvc.h +++ b/cmd/runsvc/runsvc.h @@ -4,6 +4,8 @@ #include #include +#include +#include #include #include #include @@ -12,7 +14,7 @@ #include "service.h" #include "libcfg.h" -#include "util.h" +#include "config.h" #define ENVFILE ETCPATH "/initd.env" -- cgit v1.2.3