Fix runlevel transition algorithm, implement SysV-style fifo interface.

* src/prog.h: New file.
* src/Makefile.am: Add new file.
* src/cmdline.opt: New option --telinit (-T).
* src/diag.c (vlogmsg): In sysvin it mode, write
directly to the console. Close it when finished.
* src/pies.c (_cb_initdefault, _cb_runlevels): Use is_valid_runlevel
to check if the specified runlevels are ok.
(main): In sysvinit mode, reset action to ACTION_CONT.
* src/pies.h (progman_filter): New proto.
(progman_accept,register_socket): Change signature.
(deregister_socket): New proto.
(register_program_socket): New proto.
* src/progman.c: Move constant and adatatype definitions to
prog.h
(prog_stop): Remove static qualifier.
(console_open): Likewise.
(progman_accept): Use new socket API.
(progman_stop): Correctly handle timeouts.
(progman_foreach): New function.
* src/socket.c: Register all sockets along with their handlers
in a doubly-linked list.
(sockinst): New struct.
(register_socket,deregister_socket): New functions.
(register_program_socket): New function.
(pies_pause): Traverse the list to find which fd has changed.
Use its registered handler to handle the event.
* src/sysvinit.c: Include prog.h
(is_valid_runlevel): New function.
(sysvinit_fifo_handler,check_fifo): New static functions.
(inittrans): Fix transition algorithm.
(telinit): New function.

9 files changed, 488 insertions, 115 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 3752eae..9e9bf80 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -40,7 +40,8 @@ noinst_HEADERS = \
  cmdline.h\
  meta1gram.h\
  meta1lex.h\
- pies.h
+ pies.h\
+ prog.h
 
 meta1lex.c: meta1gram.h
 
diff --git a/src/cmdline.opt b/src/cmdline.opt
index 31fcf20..76fc4da 100644
--- a/src/cmdline.opt
+++ b/src/cmdline.opt
@@ -110,7 +110,14 @@ BEGIN
   log_to_stderr_only = 1;
   lint_mode = 1;
 END
-       
+
+OPTION(telinit,T,RUNLEVEL,
+       [<emulate telinit command>])
+BEGIN
+  log_to_stderr_only = 1;
+  exit (telinit (optarg));
+END
+
 GROUP(Preprocessor)
 
 OPTION(define,D,[<NAME[=VALUE]>],
diff --git a/src/diag.c b/src/diag.c
index fe057d0..bb64ab9 100644
--- a/src/diag.c
+++ b/src/diag.c
@@ -42,17 +42,42 @@ syslog_printer (int prio, const char *fmt, va_list ap)
 #endif
 }
 
+static FILE *
+stderr_open ()
+{
+  if (!init_process)
+    return stderr;
+  else
+    {
+      int fd = console_open (O_WRONLY|O_NOCTTY|O_NDELAY);
+      if (fd == -1)
+        return NULL;
+      return fdopen (fd, "w");
+    }
+}
+
+static void
+stderr_close (FILE *fp)
+{
+  if (init_process)
+    fclose (fp);
+}
+
 void
 vlogmsg (int prio, const char *fmt, va_list ap)
 {
   if (DIAG_OUTPUT (DIAG_TO_STDERR))
     {
       va_list aq;
-      fprintf (stderr, "%s: ", program_name);
+      FILE *fp = stderr_open ();
+      if (!fp)
+        return;
+      fprintf (fp, "%s: ", program_name);
       va_copy (aq, ap);
-      vfprintf (stderr, fmt, aq);
+      vfprintf (fp, fmt, aq);
       va_end (aq);
-      fprintf (stderr, "\n");
+      fprintf (fp, "\n");
+      stderr_close (fp);
     }
   
   if (DIAG_OUTPUT (DIAG_TO_SYSLOG))
diff --git a/src/pies.c b/src/pies.c
index a2dc5e0..41ca486 100644
--- a/src/pies.c
+++ b/src/pies.c
@@ -959,8 +959,6 @@ _cb_flags (enum grecs_callback_command cmd,
   return 0;
 }
 
-static const char valid_runlevels[] = "0123456789Ss";
-
 static int
 _cb_initdefault (enum grecs_callback_command cmd,
                   grecs_locus_t *locus,
@@ -975,7 +973,7 @@ _cb_initdefault (enum grecs_callback_command cmd,
       grecs_error (locus, 0, _("argument must be a single character"));
       return 1;
     }
-  if (!strchr (valid_runlevels, value->v.string[0]))
+  if (!is_valid_runlevel (value->v.string[0]))
     {
       grecs_error (locus, 0, _("not a valid runlevel"));
       return 1;
@@ -995,7 +993,7 @@ _cb_runlevels (enum grecs_callback_command cmd,
     return 1;
   for (p = value->v.string; *p; p++)
     {
-      if (!strchr (valid_runlevels, *p))
+      if (!is_valid_runlevel (*p))
          {
            grecs_error (locus, 0, _("not a valid runlevel: %c"));
            return 1;
@@ -2332,7 +2330,7 @@ main (int argc, char **argv)
                 (unsigned long) pid);
         exit (EX_USAGE);
       }
-  
+
   logmsg (LOG_INFO, _("%s %s starting"), proginfo.package, proginfo.version);
 
   if (!foreground)
@@ -2381,6 +2379,14 @@ main (int argc, char **argv)
           progman_dump_stats (statfile);
           action = ACTION_CONT;
           break;
+
+        case ACTION_STOP:
+        case ACTION_RESTART:
+          if (init_process)
+            {
+              debug (1, ("ignoring stop/restart"));
+              action = ACTION_CONT;
+            }
         }
       if (action == ACTION_CONT)
         {
diff --git a/src/pies.h b/src/pies.h
index e7ad1c6..2203d87 100644
--- a/src/pies.h
+++ b/src/pies.h
@@ -285,11 +285,13 @@ void progman_start (void);
 void progman_wake_sleeping (int);
 void progman_stop (void);
 void progman_cleanup (int expect_term);
+void progman_filter (int (*filter) (struct component *, void *data),
+                     void *data);
 void progman_stop_component (const char *name);
 void progman_dump_stats (const char *filename);
 void progman_dump_prereq (void);
 void progman_dump_depmap (void);
-int progman_accept (int socket);
+int progman_accept (int socket, void *data);
 int progman_build_depmap (void);
 void progman_create_sockets (void);
 struct component *progman_lookup_component (const char *tag);
@@ -362,7 +364,10 @@ void pies_url_destroy (struct pies_url **purl);
 const char * pies_url_get_arg (struct pies_url *url, const char *argname);
 
 void pies_pause (void);
-int register_socket (int socktype, int fd);
+void *register_socket (int fd, int (*handler) (int, void *), void *data);
+void deregister_socket (int fd);
+
+int register_program_socket (int socktype, int fd, void *data);
 int pass_fd (const char *socket, int fd, unsigned time_out);
 int create_socket (struct pies_url *url, int socket_type,
                    const char *user, mode_t umask);
@@ -456,6 +461,33 @@ struct inetd_builtin *inetd_builtin_lookup (const char *service, int socktype);
 void sysvinit_begin (void);
 int inittrans (void);
 int is_comp_wait (struct component *comp);
+int is_valid_runlevel (int c);
+
+#ifndef INIT_FIFO
+# define INIT_FIFO  "/dev/initctl"
+#endif
+
+#define INIT_MAGIC 0x03091969
+#define INIT_CMD_START          0
+#define INIT_CMD_RUNLVL         1
+#define INIT_CMD_POWERFAIL      2
+#define INIT_CMD_POWERFAILNOW   3
+#define INIT_CMD_POWEROK        4
+#define INIT_CMD_BSD            5
+#define INIT_CMD_SETENV         6
+#define INIT_CMD_UNSETENV       7
+
+#define INIT_CMD_CHANGECONS     12345
+
+struct sysvinit_request {
+  int   magic;                  /* Magic number                 */
+  int   cmd;                    /* What kind of request         */
+  int   runlevel;               /* Runlevel to change to        */
+  int   sleeptime;              /* Time between TERM and KILL   */
+  char  pad[368];
+};
+
+
 
 /* utmp.c */
 #define SYSV_ACCT_BOOT 0
diff --git a/src/prog.h b/src/prog.h
new file mode 100644
index 0000000..2fd4c47
--- /dev/null
+++ b/src/prog.h
@@ -0,0 +1,85 @@
+/* This file is part of GNU Pies.
+   Copyright (C) 2008, 2009, 2010, 2011 Sergey Poznyakoff
+
+   GNU Pies 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, or (at your option)
+   any later version.
+
+   GNU Pies is di