From 9b52c0d4544b2ed0fba156f87b75632c75b2084c Mon Sep 17 00:00:00 2001 From: Mathieu Lirzin Date: Mon, 24 Apr 2017 21:28:09 +0200 Subject: wrapper: Move 'wrap_env_path' to a new 'utils' module. * src/wrapper.c: Move 'wrap_env_path' to ... * src/utils.h: ... here. New module. * src/utils.c: New file. * configure.ac: Use AC_PROG_RANLIB and AM_PROG_AR. * Makefile.am (noinst_LIBRARIES, src_libmcron_a_SOURCES): New variables. (LDADD): Add 'src/libmcron.a'. --- src/wrapper.c | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) (limited to 'src/wrapper.c') diff --git a/src/wrapper.c b/src/wrapper.c index cef6b3c..d5be805 100644 --- a/src/wrapper.c +++ b/src/wrapper.c @@ -21,6 +21,7 @@ is needed because the crontab personality requires SUID which is not permitted for executable scripts. */ +#include "utils.h" #include #include #include @@ -29,7 +30,6 @@ #include /* Forward declarations. */ -static void wrap_env_path (const char *envar, const char *dir); static void inner_main (void *closure, int argc, char **argv); static void react_to_terminal_signal (int sig); static SCM set_cron_signals (void); @@ -51,29 +51,6 @@ main (int argc, char **argv) return EXIT_SUCCESS; } -/* Append DIR in front of ENVAR environment variable value. If ENVAR is not - defined, then define it with DIR. Bail out if something went wrong. */ -static void -wrap_env_path (const char *envar, const char *dir) -{ - const char *path = getenv (envar); - if (path == NULL) - setenv (envar, dir, true); - else - { - char *new_path; - int ret = asprintf (&new_path, "%s:%s", dir, path); - if (ret >= 0) - setenv (envar, new_path, true); - else - { - perror (envar); - exit (EXIT_FAILURE); - } - free (new_path); - } -} - /* Launch the Mcron Guile main program. */ static void inner_main (void *closure, int argc, char **argv) -- cgit v1.2.3