From c01106387f6d0866ef6fd4801473984cc642e60b Mon Sep 17 00:00:00 2001 From: Mathieu Lirzin Date: Tue, 25 Apr 2017 00:29:32 +0200 Subject: Replace generic C wrapper with individual programs * src/wrapper.c: Delete. * src/crontab.c: New file. * src/mcron.c: Likewise. * src/cron.c: Likewise. * configure.ac: Adapt 'AC_CONFIG_DIR' to use "src/mcron.c". * Makefile.am (bin_crontab_SOURCES, bin_cron_SOURCES) (bin_mcron_SOURCES): Use new files. (bin_cron_CPPFLAGS, bin_mcron_CPPFLAGS, bin_crontab_CPPFLAGS): Delete. --- Makefile.am | 9 ++---- configure.ac | 2 +- src/cron.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++ src/crontab.c | 49 ++++++++++++++++++++++++++++++++ src/mcron.c | 49 ++++++++++++++++++++++++++++++++ src/wrapper.c | 90 ----------------------------------------------------------- 6 files changed, 182 insertions(+), 97 deletions(-) create mode 100644 src/cron.c create mode 100644 src/crontab.c create mode 100644 src/mcron.c delete mode 100644 src/wrapper.c diff --git a/Makefile.am b/Makefile.am index e5a105f..edca6a9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,16 +38,13 @@ AM_CPPFLAGS = \ AM_CFLAGS = @GUILE_CFLAGS@ LDADD = @GUILE_LIBS@ src/libmcron.a -bin_mcron_SOURCES = src/wrapper.c -bin_mcron_CPPFLAGS = $(AM_CPPFLAGS) -DPROGRAM="\"mcron\"" +bin_mcron_SOURCES = src/mcron.c bin_mcron_DEPENDENCIES = $(compiled_modules) -bin_cron_SOURCES = src/wrapper.c -bin_cron_CPPFLAGS = $(AM_CPPFLAGS) -DPROGRAM="\"cron\"" +bin_cron_SOURCES = src/cron.c bin_cron_DEPENDENCIES = $(compiled_modules) -bin_crontab_SOURCES = src/wrapper.c -bin_crontab_CPPFLAGS = $(AM_CPPFLAGS) -DPROGRAM="\"crontab\"" +bin_crontab_SOURCES = src/crontab.c bin_crontab_DEPENDENCIES = $(compiled_modules) # wrapper to be used in the build environment and for running tests. diff --git a/configure.ac b/configure.ac index 98df7f9..0ce6475 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.61) AC_INIT([GNU Mcron], m4_esyscmd([build-aux/git-version-gen .tarball-version]), [bug-mcron@gnu.org]) -AC_CONFIG_SRCDIR([src/wrapper.c]) +AC_CONFIG_SRCDIR([src/mcron.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_REQUIRE_AUX_FILE([test-driver.scm]) AC_REQUIRE_AUX_FILE([git-version-gen]) diff --git a/src/cron.c b/src/cron.c new file mode 100644 index 0000000..55bcaaf --- /dev/null +++ b/src/cron.c @@ -0,0 +1,80 @@ +/* cron.c -- run jobs at scheduled times + Copyright © 2003, 2014 Dale Mellor + Copyright © 2015, 2016, 2017 Mathieu Lirzin + + This file is part of GNU Mcron. + + GNU Mcron 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. + + GNU Mcron 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 GNU Mcron. If not, see . */ + +#include "utils.h" +#include +#include + +/* Forward declarations. */ +static void inner_main (void *closure, int argc, char *argv[]); +static void react_to_terminal_signal (int sig); +static SCM set_cron_signals (void); + +int +main (int argc, char *argv[]) +{ + /* Set Guile load paths to ensure that Mcron modules will be found after + installation. In a build environment let the 'pre-inst-env' script set + the correct paths. */ + if (getenv ("MCRON_UNINSTALLED") == NULL) + { + wrap_env_path ("GUILE_LOAD_PATH", PACKAGE_LOAD_PATH); + wrap_env_path ("GUILE_LOAD_COMPILED_PATH", PACKAGE_LOAD_COMPILED_PATH); + } + + scm_boot_guile (argc, argv, inner_main, NULL); + + return EXIT_SUCCESS; +} + +/* Launch the Mcron Guile main program. */ +static void +inner_main (void *closure, int argc, char *argv[]) +{ + scm_set_current_module (scm_c_resolve_module ("mcron scripts cron")); + scm_c_define_gsubr ("c-set-cron-signals", 0, 0, 0, set_cron_signals); + scm_call_0 (scm_variable_ref (scm_c_lookup ("main"))); +} + +/* Set up all the signal handlers. This is necessary to perform the signal + processing in C because the sigaction function won't work when called from + Guile. */ +static SCM +set_cron_signals () +{ + static struct sigaction sa; + + memset (&sa, 0, sizeof (sa)); + sa.sa_handler = react_to_terminal_signal; + sigaction (SIGTERM, &sa, 0); + sigaction (SIGINT, &sa, 0); + sigaction (SIGQUIT, &sa, 0); + sigaction (SIGHUP, &sa, 0); + + return SCM_BOOL_T; +} + +/* Handle signal SIG and exit. All signals that cron handles will produce the + same behavior so we don't need to use SIG in the implementation. */ +static void +react_to_terminal_signal (int sig) +{ + scm_c_eval_string ("(delete-run-file)"); + exit (EXIT_FAILURE); +} diff --git a/src/crontab.c b/src/crontab.c new file mode 100644 index 0000000..a432f1d --- /dev/null +++ b/src/crontab.c @@ -0,0 +1,49 @@ +/* crontab.c -- edit users' crontab files + Copyright © 2003, 2014 Dale Mellor + Copyright © 2015, 2016, 2017 Mathieu Lirzin + + This file is part of GNU Mcron. + + GNU Mcron 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. + + GNU Mcron 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 GNU Mcron. If not, see . */ + +#include "utils.h" +#include + +/* Forward declarations. */ +static void inner_main (void *closure, int argc, char *argv[]); + +int +main (int argc, char *argv[]) +{ + /* Set Guile load paths to ensure that Mcron modules will be found after + installation. In a build environment let the 'pre-inst-env' script set + the correct paths. */ + if (getenv ("MCRON_UNINSTALLED") == NULL) + { + wrap_env_path ("GUILE_LOAD_PATH", PACKAGE_LOAD_PATH); + wrap_env_path ("GUILE_LOAD_COMPILED_PATH", PACKAGE_LOAD_COMPILED_PATH); + } + + scm_boot_guile (argc, argv, inner_main, NULL); + + return EXIT_SUCCESS; +} + +/* Launch the Mcron Guile main program. */ +static void +inner_main (void *closure, int argc, char *argv[]) +{ + scm_set_current_module (scm_c_resolve_module ("mcron scripts crontab")); + scm_call_0 (scm_variable_ref (scm_c_lookup ("main"))); +} diff --git a/src/mcron.c b/src/mcron.c new file mode 100644 index 0000000..43afc72 --- /dev/null +++ b/src/mcron.c @@ -0,0 +1,49 @@ +/* mcron.c -- run jobs at scheduled times + Copyright © 2003, 2014 Dale Mellor + Copyright © 2015, 2016, 2017 Mathieu Lirzin + + This file is part of GNU Mcron. + + GNU Mcron 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. + + GNU Mcron 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 GNU Mcron. If not, see . */ + +#include "utils.h" +#include + +/* Forward declarations. */ +static void inner_main (void *closure, int argc, char *argv[]); + +int +main (int argc, char *argv[]) +{ + /* Set Guile load paths to ensure that Mcron modules will be found after + installation. In a build environment let the 'pre-inst-env' script set + the correct paths. */ + if (getenv ("MCRON_UNINSTALLED") == NULL) + { + wrap_env_path ("GUILE_LOAD_PATH", PACKAGE_LOAD_PATH); + wrap_env_path ("GUILE_LOAD_COMPILED_PATH", PACKAGE_LOAD_COMPILED_PATH); + } + + scm_boot_guile (argc, argv, inner_main, NULL); + + return EXIT_SUCCESS; +} + +/* Launch the Mcron Guile main program. */ +static void +inner_main (void *closure, int argc, char *argv[]) +{ + scm_set_current_module (scm_c_resolve_module ("mcron scripts mcron")); + scm_call_0 (scm_variable_ref (scm_c_lookup ("main"))); +} diff --git a/src/wrapper.c b/src/wrapper.c deleted file mode 100644 index d5be805..0000000 --- a/src/wrapper.c +++ /dev/null @@ -1,90 +0,0 @@ -/* wrapper.c -- C code booting Guile - Copyright © 2003, 2014 Dale Mellor - Copyright © 2015, 2016, 2017 Mathieu Lirzin - - This file is part of GNU Mcron. - - GNU Mcron 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. - - GNU Mcron 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 GNU Mcron. If not, see . */ - -/* This C code represents a thin wrapper around the Guile code of Mcron. It - is needed because the crontab personality requires SUID which is not - permitted for executable scripts. */ - -#include "utils.h" -#include -#include -#include -#include -#include -#include - -/* Forward declarations. */ -static void inner_main (void *closure, int argc, char **argv); -static void react_to_terminal_signal (int sig); -static SCM set_cron_signals (void); - -int -main (int argc, char **argv) -{ - /* Set Guile load paths to ensure that Mcron modules will be found after - installation. In a build environment let the 'pre-inst-env' script set - the correct paths. */ - if (getenv ("MCRON_UNINSTALLED") == NULL) - { - wrap_env_path ("GUILE_LOAD_PATH", PACKAGE_LOAD_PATH); - wrap_env_path ("GUILE_LOAD_COMPILED_PATH", PACKAGE_LOAD_COMPILED_PATH); - } - - scm_boot_guile (argc, argv, inner_main, 0); - - return EXIT_SUCCESS; -} - -/* Launch the Mcron Guile main program. */ -static void -inner_main (void *closure, int argc, char **argv) -{ - scm_set_current_module (scm_c_resolve_module ("mcron scripts " PROGRAM)); - /* Register the procedures to be called from Guile. */ - scm_c_define_gsubr ("c-set-cron-signals", 0, 0, 0, set_cron_signals); - /* Call main procedure. */ - scm_call_0 (scm_variable_ref (scm_c_lookup ("main"))); -} - -/* Set up all the signal handlers as required by the cron personality. This - is necessary to perform the signal processing in C because the sigaction - function won't work when called from Guile. */ -static SCM -set_cron_signals () -{ - static struct sigaction sa; - - memset (&sa, 0, sizeof (sa)); - sa.sa_handler = react_to_terminal_signal; - sigaction (SIGTERM, &sa, 0); - sigaction (SIGINT, &sa, 0); - sigaction (SIGQUIT, &sa, 0); - sigaction (SIGHUP, &sa, 0); - - return SCM_BOOL_T; -} - -/* Handle signal SIG and exit. All signals that mcron handles will produce - the same behavior so we don't need to use SIG in the implementation. */ -static void -react_to_terminal_signal (int sig) -{ - scm_c_eval_string ("(delete-run-file)"); - exit (EXIT_FAILURE); -} -- cgit v1.2.3