From f38163772cb8ca25c440393132e8678e65437320 Mon Sep 17 00:00:00 2001
From: David Oberhollenzer <david.oberhollenzer@tele2.at>
Date: Sun, 16 Sep 2018 21:52:46 +0200
Subject: Add simple cron implementation

Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>
---
 lib/Makemodule.am     |  2 +-
 lib/cron/rdcron.c     |  5 ++++
 lib/include/service.h |  6 +++++
 lib/util/argv_exec.c  | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 lib/util/argv_exec.c

(limited to 'lib')

diff --git a/lib/Makemodule.am b/lib/Makemodule.am
index 7620e63..fb6ca92 100644
--- a/lib/Makemodule.am
+++ b/lib/Makemodule.am
@@ -4,7 +4,7 @@ libinit_a_SOURCES = lib/util/delsvc.c lib/util/svcmap.c lib/util/enum_by_name.c
 libinit_a_SOURCES += lib/util/rdsvc.c lib/util/svcscan.c lib/util/mksock.c
 libinit_a_SOURCES += lib/util/del_svc_list.c lib/util/svc_tsort.c
 libinit_a_SOURCES += lib/util/opensock.c lib/util/enum_to_name.c
-libinit_a_SOURCES += lib/util/print_version.c $(HEADRS)
+libinit_a_SOURCES += lib/util/print_version.c lib/util/argv_exec.c $(HEADRS)
 libinit_a_CPPFLAGS = $(AM_CPPFLAGS)
 libinit_a_CFLAGS = $(AM_CFLAGS)
 
diff --git a/lib/cron/rdcron.c b/lib/cron/rdcron.c
index 42936ce..c581b7e 100644
--- a/lib/cron/rdcron.c
+++ b/lib/cron/rdcron.c
@@ -490,6 +490,11 @@ crontab_t *rdcron(int dirfd, const char *filename)
 	}
 
 	cron->pid = -1;
+	cron->minute = 0xFFFFFFFFFFFFFFFFUL;
+	cron->hour = 0xFFFFFFFF;
+	cron->dayofmonth = 0xFFFFFFFF;
+	cron->month = 0xFFFF;
+	cron->dayofweek = 0xFF;
 
 	rdline_init(&rd, fd, filename, 0, NULL);
 	ret = rdcfg(cron, &rd, cron_params, ARRAY_SIZE(cron_params), 0);
diff --git a/lib/include/service.h b/lib/include/service.h
index ceaf782..abe4968 100644
--- a/lib/include/service.h
+++ b/lib/include/service.h
@@ -20,6 +20,8 @@
 
 #include <sys/types.h>
 
+#include "util.h"
+
 enum {
 	/*
 		Start the service in the background and continue with
@@ -123,5 +125,9 @@ const char *svc_target_to_string(int target);
 
 int svc_target_from_string(const char *target);
 
+int setup_tty(const char *tty, bool truncate);
+
+NORETURN void argv_exec(exec_t *e);
+
 #endif /* SERVICE_H */
 
diff --git a/lib/util/argv_exec.c b/lib/util/argv_exec.c
new file mode 100644
index 0000000..e39153c
--- /dev/null
+++ b/lib/util/argv_exec.c
@@ -0,0 +1,67 @@
+/* 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 <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <fcntl.h>
+#include <stdio.h>
+
+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;
+}
+
+void argv_exec(exec_t *e)
+{
+	char **argv = alloca(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);
+}
-- 
cgit v1.2.3