From 9b52c0d4544b2ed0fba156f87b75632c75b2084c Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin <mthl@gnu.org>
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/utils.c   | 44 ++++++++++++++++++++++++++++++++++++++++++++
 src/utils.h   | 27 +++++++++++++++++++++++++++
 src/wrapper.c | 25 +------------------------
 3 files changed, 72 insertions(+), 24 deletions(-)
 create mode 100644 src/utils.c
 create mode 100644 src/utils.h

(limited to 'src')

diff --git a/src/utils.c b/src/utils.c
new file mode 100644
index 0000000..b011e77
--- /dev/null
+++ b/src/utils.c
@@ -0,0 +1,44 @@
+/* utils.c -- Utility functions.
+   Copyright © 2017 Mathieu Lirzin <mthl@gnu.org>
+
+   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 <http://www.gnu.org/licenses/>.  */
+
+#include "utils.h"
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+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);
+    }
+}
diff --git a/src/utils.h b/src/utils.h
new file mode 100644
index 0000000..5a71afd
--- /dev/null
+++ b/src/utils.h
@@ -0,0 +1,27 @@
+/* utils.h -- Utility functions.
+   Copyright © 2017 Mathieu Lirzin <mthl@gnu.org>
+
+   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 <http://www.gnu.org/licenses/>.  */
+
+#ifndef MCRON_UTILS_H
+#define MCRON_UTILS_H
+
+/**
+   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.  */
+extern void wrap_env_path (const char *envar, const char *dir);
+
+#endif /* MCRON_UTILS_H */
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 <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)
-- 
cgit v1.2.3