From bf878d08ddfb01aaaf6f81ff4592764cd1c0b4ac Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Wed, 21 Nov 2018 12:01:39 +0100 Subject: Remove cron daemon, rewritten and split off into seperate repo Signed-off-by: David Oberhollenzer --- cmd/Makemodule.am | 5 --- cmd/service/schedule.c | 90 ------------------------------------------------ cmd/service/service.8 | 10 ------ cmd/service/unschedule.c | 82 ------------------------------------------- 4 files changed, 187 deletions(-) delete mode 100644 cmd/service/schedule.c delete mode 100644 cmd/service/unschedule.c (limited to 'cmd') diff --git a/cmd/Makemodule.am b/cmd/Makemodule.am index ea25ea8..07b50ce 100644 --- a/cmd/Makemodule.am +++ b/cmd/Makemodule.am @@ -26,11 +26,6 @@ service_CFLAGS = $(AM_CFLAGS) service_LDFLAGS = $(AM_LDFLAGS) service_LDADD = libinit.a libcfg.a libutil.a -if GCROND -service_SOURCES += cmd/service/schedule.c -service_SOURCES += cmd/service/unschedule.c -endif - dist_man8_MANS += cmd/shutdown.8 cmd/service/service.8 EXTRA_DIST += $(SRVHEADERS) diff --git a/cmd/service/schedule.c b/cmd/service/schedule.c deleted file mode 100644 index 41a4f1d..0000000 --- a/cmd/service/schedule.c +++ /dev/null @@ -1,90 +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 . - */ -#include -#include -#include -#include -#include -#include -#include - -#include "servicecmd.h" - -static int cmd_schedule(int argc, char **argv) -{ - char *target, *linkname, *ptr; - int ret = EXIT_FAILURE; - struct stat sb; - - if (check_arguments(argv[0], argc, 2, 2)) - return EXIT_FAILURE; - - for (ptr = argv[1]; isalnum(*ptr) || *ptr == '_'; ++ptr) - ; - - if (*ptr != '\0') { - fprintf(stderr, "Invalid service name '%s'\n", argv[1]); - tell_read_help(argv[0]); - return EXIT_FAILURE; - } - - if (asprintf(&target, "%s/%s.gcron", TEMPLATEDIR, argv[1]) < 0) { - perror("asprintf"); - return EXIT_FAILURE; - } - - if (stat(target, &sb)) { - fprintf(stderr, "%s: %s\n", target, strerror(errno)); - goto out_tgt; - } - - if ((sb.st_mode & S_IFMT) != S_IFREG) { - fprintf(stderr, "%s: must be a regular file\n", target); - goto out_tgt; - } - - if (asprintf(&linkname, "%s/%s", GCRONDIR, argv[1]) < 0) { - perror("asprintf"); - goto out_tgt; - } - - if (symlink(target, linkname)) { - fprintf(stderr, "creating symlink '%s' -> '%s: %s\n", - linkname, target, strerror(errno)); - goto out; - } - - ret = EXIT_SUCCESS; -out: - free(linkname); -out_tgt: - free(target); - return ret; -} - -static command_t schedule = { - .cmd = "schedule", - .usage = "", - .s_desc = "enable a gcrond service", - .l_desc = "This marks a gcrond service as enabled by creating a " - "symlink in " GCRONDIR " pointing to a template file in " - TEMPLATEDIR " with a .gcron extension.", - .run_cmd = cmd_schedule, -}; - -REGISTER_COMMAND(schedule) diff --git a/cmd/service/service.8 b/cmd/service/service.8 index 3ca7cb2..139bdb5 100644 --- a/cmd/service/service.8 +++ b/cmd/service/service.8 @@ -28,12 +28,6 @@ configuration directory, pointing to the service template file. An optional argument can be supplied to parameterize the template. .TP -.BR schedule " " \fI\fP -If built with support for gcrond, enable a gcron service by creating a symlink -in the gcrond configuration directory, pointing to the service file. - -The extension \fB.gcron\fP is automatically appended to the service name. -.TP .BR disable " " \fI\fP " " \fI[arguments]\fP Disable (but do not stop) a system service by removing the corresponding symlink in the configuration directory. @@ -41,10 +35,6 @@ symlink in the configuration directory. If the service is parameterized, arguments have to be specified to disable the desired service instance. .TP -.BR unschedule " " \fI\fP -If built with support for gcrond, disable a gcron service by removing the -corresponding symlink in the gcron configuration directory. -.TP .BR dumpscript " " \fI\fP " " \fI[arguments]\fP Parse a service file from and produce a pseudo shell script containing the exact commands executed when starting the service. diff --git a/cmd/service/unschedule.c b/cmd/service/unschedule.c deleted file mode 100644 index aea6982..0000000 --- a/cmd/service/unschedule.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 . - */ -#include -#include -#include -#include -#include -#include -#include - -#include "servicecmd.h" - -static int cmd_unschedule(int argc, char **argv) -{ - int ret = EXIT_FAILURE; - char *linkname, *ptr; - struct stat sb; - - if (check_arguments(argv[0], argc, 2, 2)) - return EXIT_FAILURE; - - for (ptr = argv[1]; isalnum(*ptr) || *ptr == '_'; ++ptr) - ; - - if (*ptr != '\0') { - fprintf(stderr, "Invalid service name '%s'\n", argv[1]); - tell_read_help(argv[0]); - return EXIT_FAILURE; - } - - if (asprintf(&linkname, "%s/%s.gcron", GCRONDIR, argv[1]) < 0) { - perror("asprintf"); - return EXIT_FAILURE; - } - - if (lstat(linkname, &sb)) { - fprintf(stderr, "lstat %s: %s\n", linkname, strerror(errno)); - goto out; - } - - if ((sb.st_mode & S_IFMT) != S_IFLNK) { - fprintf(stderr, "error: '%s' is not a symlink!", linkname); - goto out; - } - - if (unlink(linkname)) { - fprintf(stderr, "removing %s: %s\n", - linkname, strerror(errno)); - goto out; - } - - ret = EXIT_SUCCESS; -out: - free(linkname); - return ret; -} - -static command_t unschedule = { - .cmd = "unschedule", - .usage = "", - .s_desc = "disable a gcrond service", - .l_desc = "This disables a gcrond service by removing the coresponding " - "symlink in " GCRONDIR ".", - .run_cmd = cmd_unschedule, -}; - -REGISTER_COMMAND(unschedule) -- cgit v1.2.3