Enable/disable SystemV init code at compile time

* configure.ac: New option --enable-sysvinit. Disable the init
code if RUN_LVL is not available.
(PIES_SYSVINIT_ENABLED): New configuration define.
(PIES_COND_SYSVINIT): New condition
Print configuration settings summary.
* src/pies.h (is_sysvinit): Check for PIES_SYSVINIT_ENABLED.
(SYSVINIT_ACTIVE): New macro.
* grecs: Upgrade.
* src/Makefile.am: Conditionally link sysvinit-related code.
* src/cmdline.opt: Disable the --telinit option if sysvinit support
is not available.
(parse_options): Use SYSVINIT_ACTIVE in the conditional.
* src/comp.c (component_verify): Check if component definition is
allowed by the current state of the sysvinit support.
* src/ctl.c: Disable the /runlevel entry point if sysvinit support
is not compiled.
* src/diag.c (stderr_open): Make sure sysvinit-related code is not
compiled if the sysvinit support is not available.
* src/pies.c (config_syntax_tab): Add entry for CONF_INITTAB only if
sysvinit support is available.
(_cb_initdefault,_cb_runlevels): Remove. Use cb_initdefault and cb_runlevels
instead.
(component_keywords): Disable runlevels without sysvinit support.
(pies_keywords): Same for initdefault.
Use SYSVINIT_ACTIVE to suppress compilation of sysvinit code without
sysvinit support.
* src/progman.c: Use SYSVINIT_ACTIVE to suppress compilation of
sysvinit code without sysvinit support.
* src/sysvinit.c (cb_initdefault,cb_runlevels): New functions.

9 files changed, 208 insertions, 170 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 16f8a75..925da88 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,11 +30,15 @@ pies_SOURCES = \
  pies.c\
  progman.c\
  socket.c\
- sysdep.c\
- sysvinit.c\
- utmp.c\
  userprivs.c
 
+if PIES_COND_SYSVINIT
+pies_SOURCES += \
+ sysvinit.c\
+ sysdep.c\
+ utmp.c
+endif
+
 noinst_HEADERS = \
  acl.h\
  cmdline.h\
diff --git a/src/cmdline.opt b/src/cmdline.opt
index d2aaf6d..d9d90e1 100644
--- a/src/cmdline.opt
+++ b/src/cmdline.opt
@@ -118,12 +118,14 @@ BEGIN
   lint_mode = 1;
 END
 
+CPP(#if PIES_SYSVINIT_ENABLED)
 OPTION(telinit,T,,
        [<telinit command: run "pies -T --help" for help>])
 BEGIN
   log_to_stderr_only = 1;
   exit (telinit (argc - (optind - 1), argv + (optind - 1)));
 END
+CPP(#endif)
 
 GROUP(Preprocessor)
 
@@ -220,7 +222,7 @@ parse_options (int *pargc, char ***pargv)
   char **argv = *pargv;
   int index;
   
-  if (init_process)
+  if (SYSVINIT_ACTIVE)
     {
       sysvinit_parse_argv (argc, argv);
       index = argc;
diff --git a/src/comp.c b/src/comp.c
index 6eeeeed..7b2b373 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -674,6 +674,9 @@ component_verify (struct component *comp, grecs_locus_t *locus)
           return 1;
         }
     default:
+      if (PIES_SYSVINIT_ENABLED && comp->mode >= pies_mark_sysvinit)
+        COMPERR (grecs_error,
+                 "%s", _("SystemV init support is not compiled in"));
       /* FIXME: more checks perhaps */
       break;
     }
diff --git a/src/ctl.c b/src/ctl.c
index d9a8998..5609f19 100644
--- a/src/ctl.c
+++ b/src/ctl.c
@@ -918,14 +918,17 @@ static void res_instance (struct ctlio *, enum http_method, char const *,
                           struct json_value *);
 static void res_programs (struct ctlio *, enum http_method, char const *,
                           struct json_value *);
+static void res_conf (struct ctlio *, enum http_method, char const *,
+                      struct json_value *);
+
+#if PIES_SYSVINIT_ENABLED
 static void res_runlevel (struct ctlio *, enum http_method, char const *,
                           struct json_value *);
 static void res_environ  (struct ctlio *, enum http_method, char const *,
                           struct json_value *);
-static void res_conf (struct ctlio *, enum http_method, char const *,
-                      struct json_value *);
-
 static int pred_sysvinit (void);
+#endif
+
 
 struct ctlio_resource
 {
@@ -943,8 +946,10 @@ static struct ctlio_resource restab[] = {
   { S(/conf),     CTL_ADMIN_STATE, NULL, res_conf },
   { S(/programs), CTL_ADMIN_STATE|CTL_USER_STATE, NULL,
     res_programs },
+#if PIES_SYSVINIT_ENABLED
   { S(/runlevel), CTL_ADMIN_STATE, pred_sysvinit, res_runlevel },
   { S(/environ),  CTL_ADMIN_STATE, pred_sysvinit, res_environ },
+#endif
   { NULL }
 #undef S
 };
@@ -2117,6 +2122,7 @@ res_programs (struct ctlio *io, enum http_method meth,
     res_programs_select (io, meth, uri, json);
 }
 
+#if PIES_SYSVINIT_ENABLED
 static int
 pred_sysvinit (void)
 {
@@ -2163,6 +2169,89 @@ res_runlevel (struct ctlio *io, enum http_method meth,
   else
     ctlio_reply (io, 405, NULL);
 }
+
+/* GET /environ          -     List entire environment
+ *   ["RUNLEVEL=3", "CONSOLE=/dev/tty", ...]  
+ * GET /environ/NAME     -     Get value of variable NAME
+ *   { "status":"OK", "value":"..." }
+ *   { "status":"ER", "error_message":"..." }
+ * DELETE /environ/NAME  -     Unset variable
+ *   { "status":"OK" }
+ *   { "status":"ER", "error_message":"..." }
+ * PUT /environ/NAME=VALUE -   Set variable 
+ *   { "status":"OK" }
+ *   { "status":"ER", "error_message":"..." }
+ */
+static void
+env_reply (struct ctlio *io, int ok, int rc)
+{
+  switch (rc)
+    {
+    case 0:
+      io->code = ok;
+      io->output.reply = json_reply_create ();
+      json_object_set_string (io->output.reply, "status", "OK");
+      break;
+
+    case 1:
+      ctlio_reply (io, 403, NULL);
+      break;
+      
+    case -1:
+      ctlio_reply (io, 404, NULL);
+    }
+}
+
+static void
+res_environ (struct ctlio *io, enum http_method meth,
+             char const *uri, struct json_value *json)
+{
+  if (meth == METH_GET)
+    {
+      if (uri && uri[1])
+        {
+          char *value;
+          
+          if (sysvinit_envlocate (uri + 1, &value) == -1)
+            ctlio_reply (io, 404, NULL);
+          else
+            {
+              env_reply (io, 200, 0);
+              json_object_set_string (io->output.reply, "value", "%s", value);
+            }
+        }
+      else
+        {
+          size_t i;
+      
+          io->output.reply = json_new_array ();
+          io->code = 200;
+          for (i = 0; sysvinit_environ_hint[i]; i++)
+            {
+              json_array_append (io->output.reply,
+                                 json_new_string (sysvinit_environ_hint[i]));
+            }
+        }
+    }
+  else if (meth == METH_DELETE)
+    {
+      if (!(uri && uri[0]))
+        ctlio_reply (io, 400, NULL);
+      else
+        env_reply (io, 200, sysvinit_envupdate (uri + 1));
+    }
+  else if (meth == METH_PUT)
+    {
+      if (!(uri && uri[0]))
+        ctlio_reply (io, 400, NULL);
+      else
+        env_reply (io, 201, sysvinit_envupdate (uri + 1));
+    }
+  else
+    ctlio_reply (io, 405, NULL);
+    
+}
+#endif
 
 /* GET /conf/runtime     -     List configuration
  * PUT /conf/runtime     -     Reload configuration
@@ -2407,85 +2496,4 @@ res_conf (struct ctlio *io, enum http_method meth,
   else 
     ctlio_reply (io, 404, NULL);
 }
-
-/* GET /environ          -     List entire environment
- *   ["RUNLEVEL=3", "CONSOLE=/dev/tty", ...]  
- * GET /environ/NAME     -     Get value of variable NAME
- *   { "status":"OK", "value":"..." }
- *   { "status":"ER", "error_message":"..." }
- * DELETE /environ/NAME  -     Unset variable
- *   { "status":"OK" }
- *   { "status":"ER", "error_message":"..." }