Initial support for running as init process.

* grecs: Upgrade.
* lib/Makefile.am: Use AM_CPPFLAGS instead of INCLUDES.
* src/Makefile.am: Likewise.
* src/acl.c: Update grecs_keyword definitions.
* src/inetd.c (inetd_conf_file): Bugfix. The ws structure could
be free'd prior to initialization.
* src/pies.c: Update grecs_keyword definitions.
(init_process,initdefault,dfl_level): New globals.
(modetab) <once>: New keyword.
(component_keywords)<runlevels,initdefault>: New keywords.
(main): Initial support for init(8) mode.
* src/pies.h (pies_comp_mode) <pies_comp_exec_once>: New constant.
(component)<runlevels>: New member.
(init_process,console_device,initdefault): New externs.
* src/progman.c (prog_status)<status_finished>: New status.
(prog)<runlevels>: New member.
(progman_running_p): New function.
(prog_start): Special handling for init process mode.
(progman_start): Likewise. Take into account runlevels.
(progman_dump_stats): New flag 'f' for status_finished.

8 files changed, 567 insertions, 209 deletions

diff --git a/grecs b/grecs
-Subproject a52ab6c6c38e1dca047ada4d60249fb323942f0
+Subproject 5596f7cdcdc1983021185c5e0900d5fcba7f328
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 2569bd1..5883021 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -25,5 +25,5 @@ libpies_a_SOURCES=\
 
 libpies_a_LIBADD=$(LIBOBJS)
 
-INCLUDES = -I$(top_srcdir)/gnu -I../gnu
+AM_CPPFLAGS = -I$(top_srcdir)/gnu -I../gnu
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 455b2c2..44e0a8d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -54,12 +54,6 @@ SUFFIXES=.opt .c .h
 
 cmdline.h: cmdline.opt
 
-INCLUDES = \
- -I$(top_srcdir)/lib\
- -I$(top_srcdir)/gnu\
- -I$(top_builddir)/gnu\
- @GRECS_INCLUDES@
-
 LDADD = \
  ../lib/libpies.a\
  @GRECS_LDADD@\
@@ -69,6 +63,10 @@ LDADD = \
 pkgstatedir=$(localstatedir)/pies
 
 AM_CPPFLAGS=\
+ -I$(top_srcdir)/lib\
+ -I$(top_srcdir)/gnu\
+ -I$(top_builddir)/gnu\
+ @GRECS_INCLUDES@\
  -DDEFAULT_PREPROCESSOR="$(DEFAULT_PREPROCESSOR)"\
  -DDEFAULT_VERSION_INCLUDE_DIR=\"$(incdir)\"\
  -DDEFAULT_INCLUDE_DIR=\"$(pkgdatadir)/include\"\
diff --git a/src/acl.c b/src/acl.c
index dc459f5..eed2d78 100644
--- a/src/acl.c
+++ b/src/acl.c
@@ -482,12 +482,12 @@ struct grecs_keyword acl_keywords[] = {
   /* TRANSLATORS: only words within angle brackets are translatable */
   { "allow", N_("[all|authenticated|group <grp: list>] [from <addr: list>]"),
     N_("Allow access"),
-    grecs_type_string, NULL, 0,
+    grecs_type_string, GRECS_MULT, NULL, 0,
     allow_cb },
   /* TRANSLATORS: only words within angle brackets are translatable */
   { "deny", N_("[all|authenticated|group <grp: list>] [from <addr: list>]"),
     N_("Deny access"),
-    grecs_type_string, NULL, 0,
+    grecs_type_string, GRECS_MULT, NULL, 0,
     deny_cb },
   { NULL }
 };
diff --git a/src/inetd.c b/src/inetd.c
index 1d7798d..febd84e 100644
--- a/src/inetd.c
+++ b/src/inetd.c
@@ -84,6 +84,7 @@ inetd_conf_file (const char *file)
   size_t line_no = 0;
   struct wordsplit ws;
   char *dfl_address = NULL;
+  int wsflags;
   
   fp = fopen (file, "r");
   if (!fp)
@@ -94,6 +95,7 @@ inetd_conf_file (const char *file)
       return 1;
     }
 
+  wsflags = WRDSF_NOVAR | WRDSF_NOCMD | WRDSF_WS | WRDSF_SQUEEZE_DELIMS;
   while (getline (&buf, &size, fp) >= 0)
     {
       char *p;      
@@ -111,9 +113,6 @@ inetd_conf_file (const char *file)
       struct inetd_builtin *builtin;
       char *tag;
       
-      if (line_no)
-        wordsplit_free (&ws);
-      
       line_no++;
       for (p = buf; *p && c_isblank (*p); p++)
         ;
@@ -121,14 +120,12 @@ inetd_conf_file (const char *file)
       if (!p || *p == '\n' || *p == '#')
         continue;
 
-      if (wordsplit (p, &ws,
-                     WRDSF_NOVAR | WRDSF_NOCMD | WRDSF_WS |
-                     WRDSF_SQUEEZE_DELIMS))
+      if (wordsplit (p, &ws, wsflags))
         {
           logmsg (LOG_ERR, "wordsplit: %s", strerror (errno));
           continue;
         }
-
+      wsflags |= WRDSF_REUSE;
       if (ws.ws_wordc == 1)
         {
           size_t len = strlen (ws.ws_wordv[IFLD_SERVICE]);
@@ -308,7 +305,7 @@ inetd_conf_file (const char *file)
         register_prog (comp);
     }
   
-  if (line_no)
+  if (wsflags & WRDSF_REUSE)
     wordsplit_free (&ws);
   free (dfl_address);
   free (buf);
diff --git a/src/pies.c b/src/pies.c
index 85bd22d..ded1a10 100644
--- a/src/pies.c
+++ b/src/pies.c
@@ -26,6 +26,7 @@ int log_facility = LOG_USER;
 char *log_tag;
 struct pies_privs pies_privs;
 int foreground;
+int init_process;
 
 enum pies_command {
   COM_START,
@@ -38,6 +39,8 @@ enum pies_command {
 };
 
 enum pies_command command;
+int initdefault;               /* Default runlevel */
+int dfl_level;
 char *statedir = DEFAULT_STATE_DIR;
 char *instance;
 char *pidfile;
@@ -95,8 +98,8 @@ str_to_config_syntax (const char *str, enum config_syntax *psynt)
   for (p = config_syntax_tab; p->name; p++)
     if (strcmp (p->name, str) == 0)
       {
-        *psynt = p->type;
-        return 0;
+         *psynt = p->type;
+         return 0;
       }
   return 1;
 }
@@ -131,7 +134,7 @@ add_pp_option (const char *opt, const char *arg)
     {
       char *qarg;
       size_t qlen;
-      
+
       if (!pp_qopt)
         {
           pp_qopt = clone_quoting_options (NULL);
@@ -158,19 +161,19 @@ stderr_closed_p ()
 
 int
 assert_grecs_value_type (grecs_locus_t *locus,
-                         const grecs_value_t *value, int type)
+                          const grecs_value_t *value, int type)
 {
   if (GRECS_VALUE_EMPTY_P (value))
     {
       grecs_error (locus, 0, _("expected %s"),
-                   grecs_data_type_string (type));
+                    grecs_data_type_string (type));
       return 1;
     }
   if (value->type != type)
     {
       grecs_error (locus, 0, _("expected %s, but found %s"),
-                   grecs_data_type_string (type),
-                   grecs_data_type_string (value->type));
+                    grecs_data_type_string (type),
+                    grecs_data_type_string (value->type));
       return 1;
     }
   return 0;
@@ -190,8 +193,8 @@ assert_scalar_stmt (grecs_locus_t *locus, enum grecs_callback_command cmd)
 
 static int
 _cb_action (enum grecs_callback_command cmd,
-            grecs_locus_t *locus,
-            void *varptr, grecs_value_t *value, void *cb_data)
+             grecs_locus_t *locus,
+             void *varptr, grecs_value_t *value, void *cb_data)
 {
   enum return_action *pact = varptr;
   static struct tokendef actab[] = {
@@ -219,24 +222,27 @@ struct grecs_keyword return_code_keywords[] = {
    N_("arg: {disable | restart}"),
    N_("Specifies action to take when a component finishes with this "
       "return code."),
-   grecs_type_string, NULL, offsetof (struct component, act_temp.act),
+   grecs_type_string, GRECS_DFLT,
+   NULL, offsetof (struct component, act_temp.act),
    _cb_action,
    },
   {"notify",
    N_("arg: emails"),
    N_("Notify this address when a component terminates."),