dmbcs/mcron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wrapper: Move 'wrap_env_path' to a new 'utils' module.

Browse source 
* 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'.
This commit is contained in:
Mathieu Lirzin 2017-04-24 21:28:09 +02:00
commit 9b52c0d454
No known key found for this signature in database
GPG key ID: 0ADEE10094604D37
6 changed files with 83 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/wrapper.c
View file

@ -21,6 +21,7 @@
is needed because the crontab personality requires SUID which is not
permitted for executable scripts. */
#include "utils.h"
#include <libguile.h>
#include <signal.h>
#include <stdbool.h>
@ -29,7 +30,6 @@
#include <string.h>
/* 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)