- update defconfig
[oweals/busybox.git] / init / init.c
index d800480ee1e993a9f42e4f55a1732a50d6cb9753..f7eb8f34ba3510d1b463e8acc1b1d18a97795e07 100644 (file)
@@ -9,80 +9,15 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-/* Turn this on to disable all the dangerous
-   rebooting stuff when debugging.
-#define DEBUG_INIT
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
+#include "libbb.h"
 #include <paths.h>
-#include <signal.h>
-#include <stdarg.h>
-#include <string.h>
-#include <termios.h>
-#include <unistd.h>
-#include <limits.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/wait.h>
 #include <sys/reboot.h>
-#include "busybox.h"
-
-#include "init_shared.h"
-
-
-#ifdef CONFIG_SYSLOGD
-# include <sys/syslog.h>
-#endif
-
-
-#ifdef CONFIG_SELINUX
-# include <selinux/selinux.h>
-#endif /* CONFIG_SELINUX */
-
+#include <sys/syslog.h>
 
 #define INIT_BUFFS_SIZE 256
+#define CONSOLE_NAME_SIZE 32
+#define MAXENV 16              /* Number of env. vars */
 
-/* From <linux/vt.h> */
-struct vt_stat {
-       unsigned short v_active;        /* active vt */
-       unsigned short v_signal;        /* signal to send */
-       unsigned short v_state; /* vt bitmask */
-};
-enum { VT_GETSTATE = 0x5603 }; /* get global vt state info */
-
-/* From <linux/serial.h> */
-struct serial_struct {
-       int     type;
-       int     line;
-       unsigned int    port;
-       int     irq;
-       int     flags;
-       int     xmit_fifo_size;
-       int     custom_divisor;
-       int     baud_base;
-       unsigned short  close_delay;
-       char    io_type;
-       char    reserved_char[1];
-       int     hub6;
-       unsigned short  closing_wait; /* time to wait before closing */
-       unsigned short  closing_wait2; /* no longer used... */
-       unsigned char   *iomem_base;
-       unsigned short  iomem_reg_shift;
-       unsigned int    port_high;
-       unsigned long   iomap_base;     /* cookie passed into ioremap */
-       int     reserved[1];
-};
-
-
-#ifndef _PATH_STDPATH
-#define _PATH_STDPATH  "/usr/bin:/bin:/usr/sbin:/sbin"
-#endif
-
-#if defined CONFIG_FEATURE_INIT_COREDUMPS
 /*
  * When a file named CORE_ENABLE_FLAG_FILE exists, setrlimit is called
  * before processes are spawned to set core file size as unlimited.
@@ -91,19 +26,12 @@ struct serial_struct {
  */
 #define CORE_ENABLE_FLAG_FILE "/.init_enable_core"
 #include <sys/resource.h>
-#endif
-
-#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
 
 #define INITTAB      "/etc/inittab"    /* inittab file location */
 #ifndef INIT_SCRIPT
 #define INIT_SCRIPT  "/etc/init.d/rcS" /* Default sysinit script. */
 #endif
 
-#define MAXENV 16              /* Number of env. vars */
-
-#define CONSOLE_BUFF_SIZE 32
-
 /* Allowed init action types */
 #define SYSINIT     0x001
 #define RESPAWN     0x002
@@ -114,54 +42,42 @@ struct serial_struct {
 #define SHUTDOWN    0x040
 #define RESTART     0x080
 
-/* A mapping between "inittab" action name strings and action type codes. */
-struct init_action_type {
-       const char *name;
-       int action;
-};
-
-static const struct init_action_type actions[] = {
-       {"sysinit", SYSINIT},
-       {"respawn", RESPAWN},
-       {"askfirst", ASKFIRST},
-       {"wait", WAIT},
-       {"once", ONCE},
-       {"ctrlaltdel", CTRLALTDEL},
-       {"shutdown", SHUTDOWN},
-       {"restart", RESTART},
-       {0, 0}
-};
+#define STR_SYSINIT     "\x01"
+#define STR_RESPAWN     "\x02"
+#define STR_ASKFIRST    "\x04"
+#define STR_WAIT        "\x08"
+#define STR_ONCE        "\x10"
+#define STR_CTRLALTDEL  "\x20"
+#define STR_SHUTDOWN    "\x40"
+#define STR_RESTART     "\x80"
 
 /* Set up a linked list of init_actions, to be read from inittab */
 struct init_action {
+       struct init_action *next;
        pid_t pid;
+       uint8_t action;
+       char terminal[CONSOLE_NAME_SIZE];
        char command[INIT_BUFFS_SIZE];
-       char terminal[CONSOLE_BUFF_SIZE];
-       struct init_action *next;
-       int action;
 };
 
 /* Static variables */
 static struct init_action *init_action_list = NULL;
-static char console[CONSOLE_BUFF_SIZE] = _PATH_CONSOLE;
 
-#ifndef CONFIG_SYSLOGD
-static char *log_console = VC_5;
-#endif
+static const char *log_console = VC_5;
 static sig_atomic_t got_cont = 0;
 
 enum {
-       LOG = 0x1,
-       CONSOLE = 0x2,
+       L_LOG = 0x1,
+       L_CONSOLE = 0x2,
 
-#if defined CONFIG_FEATURE_EXTRA_QUIET
+#if ENABLE_FEATURE_EXTRA_QUIET
        MAYBE_CONSOLE = 0x0,
 #else
-       MAYBE_CONSOLE = CONSOLE,
+       MAYBE_CONSOLE = L_CONSOLE,
 #endif
 
 #ifndef RB_HALT_SYSTEM
-       RB_HALT_SYSTEM = 0xcdef0123,
+       RB_HALT_SYSTEM = 0xcdef0123, /* FIXME: this overflows enum */
        RB_ENABLE_CAD = 0x89abcdef,
        RB_DISABLE_CAD = 0,
        RB_POWER_OFF = 0x4321fedc,
@@ -169,9 +85,9 @@ enum {
 #endif
 };
 
-static const char * const environment[] = {
+static const char *const environment[] = {
        "HOME=/",
-       "PATH=" _PATH_STDPATH,
+       bb_PATH_root_path,
        "SHELL=/bin/sh",
        "USER=root",
        NULL
@@ -179,10 +95,21 @@ static const char * const environment[] = {
 
 /* Function prototypes */
 static void delete_init_action(struct init_action *a);
-static int waitfor(const struct init_action *a);
-static void halt_signal(int sig);
+static void halt_reboot_pwoff(int sig) ATTRIBUTE_NORETURN;
 
+static void waitfor(pid_t pid)
+{
+       /* waitfor(run(x)): protect against failed fork inside run() */
+       if (pid <= 0)
+               return;
 
+       /* Wait for any child (prevent zombies from exiting orphaned processes)
+        * but exit the loop only when specified one has exited. */
+       while (wait(NULL) != pid)
+               continue;
+}
+
+static void loop_forever(void) ATTRIBUTE_NORETURN;
 static void loop_forever(void)
 {
        while (1)
@@ -190,87 +117,128 @@ static void loop_forever(void)
 }
 
 /* Print a message to the specified device.
- * Device may be bitwise-or'd from LOG | CONSOLE */
-#ifndef DEBUG_INIT
-static inline void messageD(int ATTRIBUTE_UNUSED device, 
-                               const char ATTRIBUTE_UNUSED *fmt, ...)
-{
-}
-#else
-#define messageD message
-#endif
+ * Device may be bitwise-or'd from L_LOG | L_CONSOLE */
+#define messageD(...) do { if (ENABLE_DEBUG_INIT) message(__VA_ARGS__); } while (0)
 static void message(int device, const char *fmt, ...)
        __attribute__ ((format(printf, 2, 3)));
 static void message(int device, const char *fmt, ...)
 {
+       static int log_fd = -1;
        va_list arguments;
        int l;
-       char msg[1024];
-#ifndef CONFIG_SYSLOGD
-       static int log_fd = -1;
-#endif
+       char msg[128];
 
        msg[0] = '\r';
-               va_start(arguments, fmt);
-       l = vsnprintf(msg + 1, sizeof(msg) - 2, fmt, arguments) + 1;
-               va_end(arguments);
-
-#ifdef CONFIG_SYSLOGD
-       /* Log the message to syslogd */
-       if (device & LOG) {
-               /* don`t out "\r\n" */
-               openlog(bb_applet_name, 0, LOG_DAEMON);
-               syslog(LOG_INFO, "%s", msg + 1);
-               closelog();
-       }
-
-       msg[l++] = '\n';
-       msg[l] = 0;
-#else
-
-       msg[l++] = '\n';
-       msg[l] = 0;
-       /* Take full control of the log tty, and never close it.
-        * It's mine, all mine!  Muhahahaha! */
-       if (log_fd < 0) {
-               if ((log_fd = device_open(log_console, O_RDWR | O_NONBLOCK | O_NOCTTY)) < 0) {
-                       log_fd = -2;
-                       bb_error_msg("Bummer, can't write to log on %s!", log_console);
-                       device = CONSOLE;
-               } else {
-                       fcntl(log_fd, F_SETFD, FD_CLOEXEC);
+       va_start(arguments, fmt);
+       vsnprintf(msg + 1, sizeof(msg) - 2, fmt, arguments);
+       va_end(arguments);
+       msg[sizeof(msg) - 2] = '\0';
+       l = strlen(msg);
+
+       if (ENABLE_FEATURE_INIT_SYSLOG) {
+               /* Log the message to syslogd */
+               if (device & L_LOG) {
+                       /* don't out "\r" */
+                       openlog(applet_name, 0, LOG_DAEMON);
+                       syslog(LOG_INFO, "init: %s", msg + 1);
+                       closelog();
+               }
+               msg[l++] = '\n';
+               msg[l] = '\0';
+       } else {
+               msg[l++] = '\n';
+               msg[l] = '\0';
+               /* Take full control of the log tty, and never close it.
+                * It's mine, all mine!  Muhahahaha! */
+               if (log_fd < 0) {
+                       if (!log_console) {
+                               log_fd = 2;
+                       } else {
+                               log_fd = device_open(log_console, O_WRONLY | O_NONBLOCK | O_NOCTTY);
+                               if (log_fd < 0) {
+                                       bb_error_msg("can't log to %s", log_console);
+                                       device = L_CONSOLE;
+                               } else {
+                                       close_on_exec_on(log_fd);
+                               }
+                       }
+               }
+               if (device & L_LOG) {
+                       full_write(log_fd, msg, l);
+                       if (log_fd == 2)
+                               return; /* don't print dup messages */
                }
        }
-       if ((device & LOG) && (log_fd >= 0)) {
-               bb_full_write(log_fd, msg, l);
+
+       if (device & L_CONSOLE) {
+               /* Send console messages to console so people will see them. */
+               full_write(2, msg, l);
        }
-#endif
+}
+
+/* From <linux/serial.h> */
+struct serial_struct {
+       int     type;
+       int     line;
+       unsigned int    port;
+       int     irq;
+       int     flags;
+       int     xmit_fifo_size;
+       int     custom_divisor;
+       int     baud_base;
+       unsigned short  close_delay;
+       char    io_type;
+       char    reserved_char[1];
+       int     hub6;
+       unsigned short  closing_wait; /* time to wait before closing */
+       unsigned short  closing_wait2; /* no longer used... */
+       unsigned char   *iomem_base;
+       unsigned short  iomem_reg_shift;
+       unsigned int    port_high;
+       unsigned long   iomap_base;     /* cookie passed into ioremap */
+       int     reserved[1];
+       /* Paranoia (imagine 64bit kernel overwriting 32bit userspace stack) */
+       uint32_t bbox_reserved[16];
+};
+static void console_init(void)
+{
+       struct serial_struct sr;
+       char *s;
 
-       if (device & CONSOLE) {
-               int fd = device_open(_PATH_CONSOLE,
-                                       O_WRONLY | O_NOCTTY | O_NONBLOCK);
-               /* Always send console messages to /dev/console so people will see them. */
+       s = getenv("CONSOLE");
+       if (!s) s = getenv("console");
+       if (s) {
+               int fd = open(s, O_RDWR | O_NONBLOCK | O_NOCTTY);
                if (fd >= 0) {
-                       bb_full_write(fd, msg, l);
-                       close(fd);
-#ifdef DEBUG_INIT
-               /* all descriptors may be closed */
-               } else {
-                       bb_error_msg("Bummer, can't print: ");
-                       va_start(arguments, fmt);
-                       vfprintf(stderr, fmt, arguments);
-                       va_end(arguments);
-#endif
+                       dup2(fd, 0);
+                       dup2(fd, 1);
+                       dup2(fd, 2);
+                       while (fd > 2) close(fd--);
                }
+               messageD(L_LOG, "console='%s'", s);
+       } else {
+               /* Make sure fd 0,1,2 are not closed */
+               bb_sanitize_stdio();
        }
+
+       s = getenv("TERM");
+       if (ioctl(0, TIOCGSERIAL, &sr) == 0) {
+               /* Force the TERM setting to vt102 for serial console
+                * if TERM is set to linux (the default) */
+               if (!s || strcmp(s, "linux") == 0)
+                       putenv((char*)"TERM=vt102");
+               if (!ENABLE_FEATURE_INIT_SYSLOG)
+                       log_console = NULL;
+       } else if (!s)
+               putenv((char*)"TERM=linux");
 }
 
 /* Set terminal settings to reasonable defaults */
-static void set_term(int fd)
+static void set_sane_term(void)
 {
        struct termios tty;
 
-       tcgetattr(fd, &tty);
+       tcgetattr(STDIN_FILENO, &tty);
 
        /* set control chars */
        tty.c_cc[VINTR] = 3;    /* C-c */
@@ -289,7 +257,6 @@ static void set_term(int fd)
        tty.c_cflag &= CBAUD | CBAUDEX | CSIZE | CSTOPB | PARENB | PARODD;
        tty.c_cflag |= CREAD | HUPCL | CLOCAL;
 
-
        /* input modes */
        tty.c_iflag = ICRNL | IXON | IXOFF;
 
@@ -300,332 +267,213 @@ static void set_term(int fd)
        tty.c_lflag =
                ISIG | ICANON | ECHO | ECHOE | ECHOK | ECHOCTL | ECHOKE | IEXTEN;
 
-       tcsetattr(fd, TCSANOW, &tty);
-}
-
-static void console_init(void)
-{
-       int fd;
-       int tried = 0;
-       struct vt_stat vt;
-       struct serial_struct sr;
-       char *s;
-
-       if ((s = getenv("CONSOLE")) != NULL || (s = getenv("console")) != NULL) {
-               safe_strncpy(console, s, sizeof(console));
-#if #cpu(sparc)
-       /* sparc kernel supports console=tty[ab] parameter which is also
-        * passed to init, so catch it here */
-               /* remap tty[ab] to /dev/ttyS[01] */
-               if (strcmp(s, "ttya") == 0)
-                       safe_strncpy(console, SC_0, sizeof(console));
-               else if (strcmp(s, "ttyb") == 0)
-                       safe_strncpy(console, SC_1, sizeof(console));
-#endif
-       } else {
-               /* 2.2 kernels: identify the real console backend and try to use it */
-               if (ioctl(0, TIOCGSERIAL, &sr) == 0) {
-                       /* this is a serial console */
-                       snprintf(console, sizeof(console) - 1, SC_FORMAT, sr.line);
-               } else if (ioctl(0, VT_GETSTATE, &vt) == 0) {
-                       /* this is linux virtual tty */
-                       snprintf(console, sizeof(console) - 1, VC_FORMAT, vt.v_active);
-               } else {
-                       safe_strncpy(console, _PATH_CONSOLE, sizeof(console));
-                       tried++;
-               }
-       }
-
-       while ((fd = open(console, O_RDONLY | O_NONBLOCK)) < 0 && tried < 2) {
-               /* Can't open selected console -- try
-                       logical system console and VT_MASTER */
-               safe_strncpy(console, (tried == 0 ? _PATH_CONSOLE : CURRENT_VC),
-                                                       sizeof(console));
-               tried++;
-       }
-       if (fd < 0) {
-               /* Perhaps we should panic here? */
-#ifndef CONFIG_SYSLOGD
-               log_console =
-#endif
-               safe_strncpy(console, bb_dev_null, sizeof(console));
-       } else {
-               s = getenv("TERM");
-               /* check for serial console */
-               if (ioctl(fd, TIOCGSERIAL, &sr) == 0) {
-                       /* Force the TERM setting to vt102 for serial console --
-                        * if TERM is set to linux (the default) */
-                       if (s == NULL || strcmp(s, "linux") == 0)
-                               putenv("TERM=vt102");
-#ifndef CONFIG_SYSLOGD
-                       log_console = console;
-#endif
-               } else {
-                       if (s == NULL)
-                               putenv("TERM=linux");
-               }
-               close(fd);
-       }
-       messageD(LOG, "console=%s", console);
-}
-
-static void fixup_argv(int argc, char **argv, char *new_argv0)
-{
-       int len;
-
-       /* Fix up argv[0] to be certain we claim to be init */
-       len = strlen(argv[0]);
-       memset(argv[0], 0, len);
-       safe_strncpy(argv[0], new_argv0, len + 1);
-
-       /* Wipe argv[1]-argv[N] so they don't clutter the ps listing */
-       len = 1;
-       while (argc > len) {
-               memset(argv[len], 0, strlen(argv[len]));
-               len++;
-       }
+       tcsetattr(STDIN_FILENO, TCSANOW, &tty);
 }
 
 /* Open the new terminal device */
-static void open_new_terminal(const char *device, char fail) {
-       struct stat sb;
-
-       if ((device_open(device, O_RDWR)) < 0) {
-               if (stat(device, &sb) != 0) {
-                       message(LOG | CONSOLE, "device '%s' does not exist.", device);
-               } else {
-                       message(LOG | CONSOLE, "Bummer, can't open %s", device);
+static void open_stdio_to_tty(const char* tty_name, int exit_on_failure)
+{
+       /* empty tty_name means "use init's tty", else... */
+       if (tty_name[0]) {
+               int fd;
+               close(0);
+               /* fd can be only < 0 or 0: */
+               fd = device_open(tty_name, O_RDWR);
+               if (fd) {
+                       message(L_LOG | L_CONSOLE, "Can't open %s: %s",
+                               tty_name, strerror(errno));
+                       if (exit_on_failure)
+                               _exit(1);
+                       if (ENABLE_DEBUG_INIT)
+                               _exit(2);
+                       halt_reboot_pwoff(SIGUSR1); /* halt the system */
                }
-               if (fail)
-                       _exit(1);
-               /* else */
-               halt_signal(SIGUSR1);
+               dup2(0, 1);
+               dup2(0, 2);
        }
+       set_sane_term();
 }
 
+/* Used only by run_actions */
 static pid_t run(const struct init_action *a)
 {
-       int i, junk;
+       int i;
        pid_t pid;
-       char *s, *tmpCmd, *cmd[INIT_BUFFS_SIZE], *cmdpath;
+       char *s, *tmpCmd, *cmdpath;
+       char *cmd[INIT_BUFFS_SIZE];
        char buf[INIT_BUFFS_SIZE + 6];  /* INIT_BUFFS_SIZE+strlen("exec ")+1 */
        sigset_t nmask, omask;
-       static const char press_enter[] =
-#ifdef CUSTOMIZED_BANNER
-#include CUSTOMIZED_BANNER
-#endif
-               "\nPlease press Enter to activate this console. ";
 
-       /* Block sigchild while forking */
+       /* Block sigchild while forking (why?) */
        sigemptyset(&nmask);
        sigaddset(&nmask, SIGCHLD);
        sigprocmask(SIG_BLOCK, &nmask, &omask);
+       pid = fork();
+       sigprocmask(SIG_SETMASK, &omask, NULL);
 
-       if ((pid = fork()) == 0) {
-
-               /* Clean up */
-               close(0);
-               close(1);
-               close(2);
-               sigprocmask(SIG_SETMASK, &omask, NULL);
-
-               /* Reset signal handlers that were set by the parent process */
-               signal(SIGUSR1, SIG_DFL);
-               signal(SIGUSR2, SIG_DFL);
-               signal(SIGINT, SIG_DFL);
-               signal(SIGTERM, SIG_DFL);
-               signal(SIGHUP, SIG_DFL);
-               signal(SIGQUIT, SIG_DFL);
-               signal(SIGCONT, SIG_DFL);
-               signal(SIGSTOP, SIG_DFL);
-               signal(SIGTSTP, SIG_DFL);
-
-               /* Create a new session and make ourself the process
-                * group leader */
-               setsid();
-
-               /* Open the new terminal device */
-               open_new_terminal(a->terminal, 1);
-
-               /* Make sure the terminal will act fairly normal for us */
-               set_term(0);
-               /* Setup stdout, stderr for the new process so
-                * they point to the supplied terminal */
-               dup(0);
-               dup(0);
-
-               /* If the init Action requires us to wait, then force the
-                * supplied terminal to be the controlling tty. */
-               if (a->action & (SYSINIT | WAIT | CTRLALTDEL | SHUTDOWN | RESTART)) {
-                       pid_t pgrp, tmp_pid;
-
-                       /* Now fork off another process to just hang around */
-                       if ((pid = fork()) < 0) {
-                               message(LOG | CONSOLE, "Can't fork!");
-                               _exit(1);
-                       }
-
-                       if (pid > 0) {
-
-                               /* We are the parent -- wait till the child is done */
-                               signal(SIGINT, SIG_IGN);
-                               signal(SIGTSTP, SIG_IGN);
-                               signal(SIGQUIT, SIG_IGN);
-                               signal(SIGCHLD, SIG_DFL);
+       if (pid < 0)
+               message(L_LOG | L_CONSOLE, "Can't fork");
+       if (pid)
+               return pid;
+
+       /* Child */
+
+       /* Reset signal handlers that were set by the parent process */
+       signal(SIGUSR1, SIG_DFL);
+       signal(SIGUSR2, SIG_DFL);
+       signal(SIGINT, SIG_DFL);
+       signal(SIGTERM, SIG_DFL);
+       signal(SIGHUP, SIG_DFL);
+       signal(SIGQUIT, SIG_DFL);
+       signal(SIGCONT, SIG_DFL);
+       signal(SIGSTOP, SIG_DFL);
+       signal(SIGTSTP, SIG_DFL);
+
+       /* Create a new session and make ourself the process
+        * group leader */
+       setsid();
 
-                               /* Wait for child to exit */
-                               while ((tmp_pid = waitpid(pid, &junk, 0)) != pid) {
-                                       if (tmp_pid == -1 && errno == ECHILD) {
-                                               break;
-                                       }
-                                       /* FIXME handle other errors */
-                               }
+       /* Open the new terminal device */
+       open_stdio_to_tty(a->terminal, 1 /* - exit if open fails*/);
+
+#ifdef BUT_RUN_ACTIONS_ALREADY_DOES_WAITING
+       /* If the init Action requires us to wait, then force the
+        * supplied terminal to be the controlling tty. */
+       if (a->action & (SYSINIT | WAIT | CTRLALTDEL | SHUTDOWN | RESTART)) {
+               /* Now fork off another process to just hang around */
+               pid = fork();
+               if (pid < 0) {
+                       message(L_LOG | L_CONSOLE, "Can't fork");
+                       _exit(1);
+               }
 
-                               /* See if stealing the controlling tty back is necessary */
-                               pgrp = tcgetpgrp(0);
-                               if (pgrp != getpid())
-                                       _exit(0);
+               if (pid > 0) {
+                       /* Parent - wait till the child is done */
+                       signal(SIGINT, SIG_IGN);
+                       signal(SIGTSTP, SIG_IGN);
+                       signal(SIGQUIT, SIG_IGN);
+                       signal(SIGCHLD, SIG_DFL);
 
-                               /* Use a temporary process to steal the controlling tty. */
-                               if ((pid = fork()) < 0) {
-                                       message(LOG | CONSOLE, "Can't fork!");
-                                       _exit(1);
-                               }
-                               if (pid == 0) {
-                                       setsid();
-                                       ioctl(0, TIOCSCTTY, 1);
-                                       _exit(0);
-                               }
-                               while ((tmp_pid = waitpid(pid, &junk, 0)) != pid) {
-                                       if (tmp_pid < 0 && errno == ECHILD)
-                                               break;
-                               }
+                       waitfor(pid);
+                       /* See if stealing the controlling tty back is necessary */
+                       if (tcgetpgrp(0) != getpid())
                                _exit(0);
-                       }
 
-                       /* Now fall though to actually execute things */
-               }
-
-               /* See if any special /bin/sh requiring characters are present */
-               if (strpbrk(a->command, "~`!$^&*()=|\\{}[];\"'<>?") != NULL) {
-                       cmd[0] = (char *)DEFAULT_SHELL;
-                       cmd[1] = "-c";
-                       cmd[2] = strcat(strcpy(buf, "exec "), a->command);
-                       cmd[3] = NULL;
-               } else {
-                       /* Convert command (char*) into cmd (char**, one word per string) */
-                       strcpy(buf, a->command);
-                       s = buf;
-                       for (tmpCmd = buf, i = 0; (tmpCmd = strsep(&s, " \t")) != NULL;) {
-                               if (*tmpCmd != '\0') {
-                                       cmd[i] = tmpCmd;
-                                       i++;
-                               }
+                       /* Use a temporary process to steal the controlling tty. */
+                       pid = fork();
+                       if (pid < 0) {
+                               message(L_LOG | L_CONSOLE, "Can't fork");
+                               _exit(1);
                        }
-                       cmd[i] = NULL;
+                       if (pid == 0) {
+                               setsid();
+                               ioctl(0, TIOCSCTTY, 1);
+                               _exit(0);
+                       }
+                       waitfor(pid);
+                       _exit(0);
                }
 
-               cmdpath = cmd[0];
-
-               /*
-                  Interactive shells want to see a dash in argv[0].  This
-                  typically is handled by login, argv will be setup this
-                  way if a dash appears at the front of the command path
-                  (like "-/bin/sh").
-                */
-
-               if (*cmdpath == '-') {
-
-                       /* skip over the dash */
-                       ++cmdpath;
-
-                       /* find the last component in the command pathname */
-                       s = bb_get_last_path_component(cmdpath);
+               /* Child - fall though to actually execute things */
+       }
+#endif
 
-                       /* make a new argv[0] */
-                       if ((cmd[0] = malloc(strlen(s) + 2)) == NULL) {
-                               message(LOG | CONSOLE, bb_msg_memory_exhausted);
-                               cmd[0] = cmdpath;
-                       } else {
-                               cmd[0][0] = '-';
-                               strcpy(cmd[0] + 1, s);
+       /* See if any special /bin/sh requiring characters are present */
+       if (strpbrk(a->command, "~`!$^&*()=|\\{}[];\"'<>?") != NULL) {
+               cmd[0] = (char*)DEFAULT_SHELL;
+               cmd[1] = (char*)"-c";
+               cmd[2] = strcat(strcpy(buf, "exec "), a->command);
+               cmd[3] = NULL;
+       } else {
+               /* Convert command (char*) into cmd (char**, one word per string) */
+               strcpy(buf, a->command);
+               s = buf;
+               for (tmpCmd = buf, i = 0; (tmpCmd = strsep(&s, " \t")) != NULL;) {
+                       if (*tmpCmd != '\0') {
+                               cmd[i] = tmpCmd;
+                               i++;
                        }
-#ifdef CONFIG_FEATURE_INIT_SCTTY
-                       /* Establish this process as session leader and
-                        * (attempt) to make the tty (if any) a controlling tty.
-                        */
-                       (void) setsid();
-                       (void) ioctl(0, TIOCSCTTY, 0/*don't steal it*/);
-#endif
                }
+               cmd[i] = NULL;
+       }
 
-#if !defined(__UCLIBC__) || defined(__ARCH_HAS_MMU__)
-               if (a->action & ASKFIRST) {
-                       char c;
-                       /*
-                        * Save memory by not exec-ing anything large (like a shell)
-                        * before the user wants it. This is critical if swap is not
-                        * enabled and the system has low memory. Generally this will
-                        * be run on the second virtual console, and the first will
-                        * be allowed to start a shell or whatever an init script
-                        * specifies.
-                        */
-                       messageD(LOG, "Waiting for enter to start '%s'"
-                                               "(pid %d, terminal %s)\n",
-                                         cmdpath, getpid(), a->terminal);
-                       bb_full_write(1, press_enter, sizeof(press_enter) - 1);
-                       while(read(0, &c, 1) == 1 && c != '\n')
-                               ;
+       cmdpath = cmd[0];
+
+       /*
+        * Interactive shells want to see a dash in argv[0].  This
+        * typically is handled by login, argv will be setup this
+        * way if a dash appears at the front of the command path
+        * (like "-/bin/sh").
+        */
+       if (*cmdpath == '-') {
+               /* skip over the dash */
+               ++cmdpath;
+
+#ifdef WHY_WE_DO_THIS_SHELL_MUST_HANDLE_THIS_ITSELF
+               /* find the last component in the command pathname */
+               s = bb_get_last_path_component_nostrip(cmdpath);
+               /* make a new argv[0] */
+               cmd[0] = malloc(strlen(s) + 2);
+               if (cmd[0] == NULL) {
+                       message(L_LOG | L_CONSOLE, bb_msg_memory_exhausted);
+                       cmd[0] = cmdpath;
+               } else {
+                       cmd[0][0] = '-';
+                       strcpy(cmd[0] + 1, s);
                }
 #endif
 
-               /* Log the process name and args */
-               message(LOG, "Starting pid %d, console %s: '%s'",
-                                 getpid(), a->terminal, cmdpath);
-
-#if defined CONFIG_FEATURE_INIT_COREDUMPS
-               {
-                       struct stat sb;
-                       if (stat(CORE_ENABLE_FLAG_FILE, &sb) == 0) {
-                               struct rlimit limit;
+               /* _Attempt_ to make stdin a controlling tty. */
+               if (ENABLE_FEATURE_INIT_SCTTY)
+                       ioctl(0, TIOCSCTTY, 0 /*only try, don't steal*/);
+       }
 
-                               limit.rlim_cur = RLIM_INFINITY;
-                               limit.rlim_max = RLIM_INFINITY;
-                               setrlimit(RLIMIT_CORE, &limit);
-                       }
-               }
+       if (a->action & ASKFIRST) {
+               static const char press_enter[] ALIGN1 =
+#ifdef CUSTOMIZED_BANNER
+#include CUSTOMIZED_BANNER
 #endif
-
-               /* Now run it.  The new program will take over this PID,
-                * so nothing further in init.c should be run. */
-               execv(cmdpath, cmd);
-
-               /* We're still here?  Some error happened. */
-               message(LOG | CONSOLE, "Bummer, could not run '%s': %m", cmdpath);
-               _exit(-1);
+                       "\nPlease press Enter to activate this console. ";
+               char c;
+               /*
+                * Save memory by not exec-ing anything large (like a shell)
+                * before the user wants it. This is critical if swap is not
+                * enabled and the system has low memory. Generally this will
+                * be run on the second virtual console, and the first will
+                * be allowed to start a shell or whatever an init script
+                * specifies.
+                */
+               messageD(L_LOG, "waiting for enter to start '%s'"
+                                       "(pid %d, tty '%s')\n",
+                                 cmdpath, getpid(), a->terminal);
+               full_write(1, press_enter, sizeof(press_enter) - 1);
+               while (safe_read(0, &c, 1) == 1 && c != '\n')
+                       continue;
        }
-       sigprocmask(SIG_SETMASK, &omask, NULL);
-       return pid;
-}
 
-static int waitfor(const struct init_action *a)
-{
-       int pid;
-       int status, wpid;
+       /* Log the process name and args */
+       message(L_LOG, "starting pid %d, tty '%s': '%s'",
+                         getpid(), a->terminal, cmdpath);
 
-       pid = run(a);
-       while (1) {
-               wpid = waitpid(pid,&status,0);
-               if (wpid == pid)
-                       break;
-               if (wpid == -1 && errno == ECHILD) {
-                       /* we missed its termination */
-                       break;
+       if (ENABLE_FEATURE_INIT_COREDUMPS) {
+               struct stat sb;
+               if (stat(CORE_ENABLE_FLAG_FILE, &sb) == 0) {
+                       struct rlimit limit;
+
+                       limit.rlim_cur = RLIM_INFINITY;
+                       limit.rlim_max = RLIM_INFINITY;
+                       setrlimit(RLIMIT_CORE, &limit);
                }
-               /* FIXME other errors should maybe trigger an error, but allow
-                * the program to continue */
        }
-       return wpid;
+
+       /* Now run it.  The new program will take over this PID,
+        * so nothing further in init.c should be run. */
+       BB_EXECVP(cmdpath, cmd);
+
+       /* We're still here?  Some error happened. */
+       message(L_LOG | L_CONSOLE, "Cannot run '%s': %s",
+                       cmdpath, strerror(errno));
+       _exit(-1);
 }
 
 /* Run all commands of a particular type */
@@ -636,10 +484,14 @@ static void run_actions(int action)
        for (a = init_action_list; a; a = tmp) {
                tmp = a->next;
                if (a->action == action) {
-                       if (access(a->terminal, R_OK | W_OK)) {
-                               delete_init_action(a);
-                       } else if (a->action & (SYSINIT | WAIT | CTRLALTDEL | SHUTDOWN | RESTART)) {
-                               waitfor(a);
+                       // Pointless: run() will error out if open of device fails.
+                       ///* a->terminal of "" means "init's console" */
+                       //if (a->terminal[0] && access(a->terminal, R_OK | W_OK)) {
+                       //      //message(L_LOG | L_CONSOLE, "Device %s cannot be opened in RW mode", a->terminal /*, strerror(errno)*/);
+                       //      delete_init_action(a);
+                       //} else
+                       if (a->action & (SYSINIT | WAIT | CTRLALTDEL | SHUTDOWN | RESTART)) {
+                               waitfor(run(a));
                                delete_init_action(a);
                        } else if (a->action & ONCE) {
                                run(a);
@@ -655,21 +507,21 @@ static void run_actions(int action)
        }
 }
 
-#ifndef DEBUG_INIT
 static void init_reboot(unsigned long magic)
 {
        pid_t pid;
        /* We have to fork here, since the kernel calls do_exit(0) in
         * linux/kernel/sys.c, which can cause the machine to panic when
         * the init process is killed.... */
-       if ((pid = fork()) == 0) {
+       pid = vfork();
+       if (pid == 0) { /* child */
                reboot(magic);
                _exit(0);
        }
-       waitpid (pid, NULL, 0);
+       waitfor(pid);
 }
 
-static void shutdown_system(void)
+static void kill_all_processes(void)
 {
        sigset_t block_signals;
 
@@ -679,7 +531,8 @@ static void shutdown_system(void)
        run_actions(SHUTDOWN);
 
        /* first disable all our signals */
-       sigemptyset(&block_signals);
+       sigfillset(&block_signals);
+       /*sigemptyset(&block_signals);
        sigaddset(&block_signals, SIGHUP);
        sigaddset(&block_signals, SIGQUIT);
        sigaddset(&block_signals, SIGCHLD);
@@ -689,29 +542,52 @@ static void shutdown_system(void)
        sigaddset(&block_signals, SIGTERM);
        sigaddset(&block_signals, SIGCONT);
        sigaddset(&block_signals, SIGSTOP);
-       sigaddset(&block_signals, SIGTSTP);
+       sigaddset(&block_signals, SIGTSTP);*/
        sigprocmask(SIG_BLOCK, &block_signals, NULL);
 
+       message(L_CONSOLE | L_LOG, "The system is going down NOW!");
+
        /* Allow Ctrl-Alt-Del to reboot system. */
        init_reboot(RB_ENABLE_CAD);
 
-       message(CONSOLE | LOG, "The system is going down NOW !!");
-       sync();
-
        /* Send signals to every process _except_ pid 1 */
-       message(CONSOLE | LOG, "Sending SIGTERM to all processes.");
+       message(L_CONSOLE | L_LOG, "Sending SIG%s to all processes", "TERM");
        kill(-1, SIGTERM);
-       sleep(1);
        sync();
+       sleep(1);
 
-       message(CONSOLE | LOG, "Sending SIGKILL to all processes.");
+       message(L_CONSOLE | L_LOG, "Sending SIG%s to all processes", "KILL");
        kill(-1, SIGKILL);
+       sync();
        sleep(1);
+}
 
-       sync();
+static void halt_reboot_pwoff(int sig)
+{
+       const char *m;
+       int rb;
+
+       kill_all_processes();
+
+       m = "halt";
+       rb = RB_HALT_SYSTEM;
+       if (sig == SIGTERM) {
+               m = "reboot";
+               rb = RB_AUTOBOOT;
+       } else if (sig == SIGUSR2) {
+               m = "poweroff";
+               rb = RB_POWER_OFF;
+       }
+       message(L_CONSOLE | L_LOG, "Requesting system %s", m);
+       /* allow time for last message to reach serial console */
+       sleep(2);
+       init_reboot(rb);
+       loop_forever();
 }
 
-static void exec_signal(int sig ATTRIBUTE_UNUSED)
+/* Handler for HUP and QUIT - exec "restart" action,
+ * else (no such action defined) do nothing */
+static void exec_restart_action(int sig ATTRIBUTE_UNUSED)
 {
        struct init_action *a, *tmp;
        sigset_t unblock_signals;
@@ -719,10 +595,11 @@ static void exec_signal(int sig ATTRIBUTE_UNUSED)
        for (a = init_action_list; a; a = tmp) {
                tmp = a->next;
                if (a->action & RESTART) {
-                       shutdown_system();
+                       kill_all_processes();
 
-                       /* unblock all signals, blocked in shutdown_system() */
-                       sigemptyset(&unblock_signals);
+                       /* unblock all signals (blocked in kill_all_processes()) */
+                       sigfillset(&unblock_signals);
+                       /*sigemptyset(&unblock_signals);
                        sigaddset(&unblock_signals, SIGHUP);
                        sigaddset(&unblock_signals, SIGQUIT);
                        sigaddset(&unblock_signals, SIGCHLD);
@@ -732,29 +609,17 @@ static void exec_signal(int sig ATTRIBUTE_UNUSED)
                        sigaddset(&unblock_signals, SIGTERM);
                        sigaddset(&unblock_signals, SIGCONT);
                        sigaddset(&unblock_signals, SIGSTOP);
-                       sigaddset(&unblock_signals, SIGTSTP);
+                       sigaddset(&unblock_signals, SIGTSTP);*/
                        sigprocmask(SIG_UNBLOCK, &unblock_signals, NULL);
 
-                       /* Close whatever files are open. */
-                       close(0);
-                       close(1);
-                       close(2);
-
                        /* Open the new terminal device */
-                       open_new_terminal(a->terminal, 0);
-
-                       /* Make sure the terminal will act fairly normal for us */
-                       set_term(0);
-                       /* Setup stdout, stderr on the supplied terminal */
-                       dup(0);
-                       dup(0);
+                       open_stdio_to_tty(a->terminal, 0 /* - halt if open fails */);
 
-                       messageD(CONSOLE | LOG, "Trying to re-exec %s", a->command);
-                       execl(a->command, a->command, NULL);
+                       messageD(L_CONSOLE | L_LOG, "Trying to re-exec %s", a->command);
+                       BB_EXECLP(a->command, a->command, NULL);
 
-                       message(CONSOLE | LOG, "exec of '%s' failed: %m",
-                                       a->command);
-                       sync();
+                       message(L_CONSOLE | L_LOG, "Cannot run '%s': %s",
+                                       a->command, strerror(errno));
                        sleep(2);
                        init_reboot(RB_HALT_SYSTEM);
                        loop_forever();
@@ -762,37 +627,6 @@ static void exec_signal(int sig ATTRIBUTE_UNUSED)
        }
 }
 
-static void halt_signal(int sig ATTRIBUTE_UNUSED)
-{
-       shutdown_system();
-       message(CONSOLE | LOG, "The system is halted.");
-       sync();
-
-       /* allow time for last message to reach serial console */
-       sleep(2);
-
-       if (sig == SIGUSR2)
-               init_reboot(RB_POWER_OFF);
-       else
-               init_reboot(RB_HALT_SYSTEM);
-
-       loop_forever();
-}
-
-static void reboot_signal(int sig ATTRIBUTE_UNUSED)
-{
-       shutdown_system();
-       message(CONSOLE | LOG, "Please stand by while rebooting the system.");
-       sync();
-
-       /* allow time for last message to reach serial console */
-       sleep(2);
-
-       init_reboot(RB_AUTOBOOT);
-
-       loop_forever();
-}
-
 static void ctrlaltdel_signal(int sig ATTRIBUTE_UNUSED)
 {
        run_actions(CTRLALTDEL);
@@ -806,7 +640,7 @@ static void stop_handler(int sig ATTRIBUTE_UNUSED)
        got_cont = 0;
        while (!got_cont)
                pause();
-       got_cont = 0;
+
        errno = saved_errno;
 }
 
@@ -816,36 +650,27 @@ static void cont_handler(int sig ATTRIBUTE_UNUSED)
        got_cont = 1;
 }
 
-#endif                                                 /* ! DEBUG_INIT */
-
-static void new_init_action(int action, const char *command, const char *cons)
+static void new_init_action(uint8_t action, const char *command, const char *cons)
 {
        struct init_action *new_action, *a, *last;
 
-       if (*cons == '\0')
-               cons = console;
-
        if (strcmp(cons, bb_dev_null) == 0 && (action & ASKFIRST))
                return;
 
-       new_action = calloc((size_t) (1), sizeof(struct init_action));
-       if (!new_action) {
-               message(LOG | CONSOLE, "Memory allocation failure");
-               loop_forever();
-       }
-
        /* Append to the end of the list */
        for (a = last = init_action_list; a; a = a->next) {
                /* don't enter action if it's already in the list,
                 * but do overwrite existing actions */
-               if ((strcmp(a->command, command) == 0) &&
-                   (strcmp(a->terminal, cons) ==0)) {
+               if ((strcmp(a->command, command) == 0)
+                && (strcmp(a->terminal, cons) == 0)
+               ) {
                        a->action = action;
-                       free(new_action);
                        return;
                }
                last = a;
        }
+
+       new_action = xzalloc(sizeof(struct init_action));
        if (last) {
                last->next = new_action;
        } else {
@@ -854,10 +679,7 @@ static void new_init_action(int action, const char *command, const char *cons)
        strcpy(new_action->command, command);
        new_action->action = action;
        strcpy(new_action->terminal, cons);
-#if 0   /* calloc zeroed always */
-       new_action->pid = 0;
-#endif
-       messageD(LOG|CONSOLE, "command='%s' action='%d' terminal='%s'\n",
+       messageD(L_LOG | L_CONSOLE, "command='%s' action=%d tty='%s'\n",
                new_action->command, new_action->action, new_action->terminal);
 }
 
@@ -887,26 +709,25 @@ static void delete_init_action(struct init_action *action)
  */
 static void parse_inittab(void)
 {
-#ifdef CONFIG_FEATURE_USE_INITTAB
        FILE *file;
-       char buf[INIT_BUFFS_SIZE], lineAsRead[INIT_BUFFS_SIZE];
-       char tmpConsole[CONSOLE_BUFF_SIZE];
-       char *id, *runlev, *action, *command, *eol;
-       const struct init_action_type *a = actions;
+       char buf[INIT_BUFFS_SIZE];
 
+       if (ENABLE_FEATURE_USE_INITTAB)
+               file = fopen(INITTAB, "r");
+       else
+               file = NULL;
 
-       file = fopen(INITTAB, "r");
+       /* No inittab file -- set up some default behavior */
        if (file == NULL) {
-               /* No inittab file -- set up some default behavior */
-#endif
                /* Reboot on Ctrl-Alt-Del */
-               new_init_action(CTRLALTDEL, "/sbin/reboot", "");
+               new_init_action(CTRLALTDEL, "reboot", "");
                /* Umount all filesystems on halt/reboot */
-               new_init_action(SHUTDOWN, "/bin/umount -a -r", "");
+               new_init_action(SHUTDOWN, "umount -a -r", "");
                /* Swapoff on halt/reboot */
-               if(ENABLE_SWAPONOFF) new_init_action(SHUTDOWN, "/sbin/swapoff -a", "");
+               if (ENABLE_SWAPONOFF)
+                       new_init_action(SHUTDOWN, "swapoff -a", "");
                /* Prepare to restart init when a HUP is received */
-               new_init_action(RESTART, "/sbin/init", "");
+               new_init_action(RESTART, "init", "");
                /* Askfirst shell on tty1-4 */
                new_init_action(ASKFIRST, bb_default_login_shell, "");
                new_init_action(ASKFIRST, bb_default_login_shell, VC_2);
@@ -916,183 +737,185 @@ static void parse_inittab(void)
                new_init_action(SYSINIT, INIT_SCRIPT, "");
 
                return;
-#ifdef CONFIG_FEATURE_USE_INITTAB
        }
 
        while (fgets(buf, INIT_BUFFS_SIZE, file) != NULL) {
-               /* Skip leading spaces */
-               for (id = buf; *id == ' ' || *id == '\t'; id++);
+               static const char actions[] =
+                       STR_SYSINIT    "sysinit\0"
+                       STR_RESPAWN    "respawn\0"
+                       STR_ASKFIRST   "askfirst\0"
+                       STR_WAIT       "wait\0"
+                       STR_ONCE       "once\0"
+                       STR_CTRLALTDEL "ctrlaltdel\0"
+                       STR_SHUTDOWN   "shutdown\0"
+                       STR_RESTART    "restart\0"
+               ;
+               char tmpConsole[CONSOLE_NAME_SIZE];
+               char *id, *runlev, *action, *command;
+               const char *a;
 
+               /* Skip leading spaces */
+               id = skip_whitespace(buf);
                /* Skip the line if it's a comment */
                if (*id == '#' || *id == '\n')
                        continue;
+               /* Trim the trailing '\n' */
+               *strchrnul(id, '\n') = '\0';
 
-               /* Trim the trailing \n */
-               eol = strrchr(id, '\n');
-               if (eol != NULL)
-                       *eol = '\0';
-
-               /* Keep a copy around for posterity's sake (and error msgs) */
-               strcpy(lineAsRead, buf);
-
-               /* Separate the ID field from the runlevels */
+               /* Line is: "id:runlevel_ignored:action:command" */
                runlev = strchr(id, ':');
-               if (runlev == NULL || *(runlev + 1) == '\0') {
-                       message(LOG | CONSOLE, "Bad inittab entry: %s", lineAsRead);
-                       continue;
-               } else {
-                       *runlev = '\0';
-                       ++runlev;
-               }
-
-               /* Separate the runlevels from the action */
-               action = strchr(runlev, ':');
-               if (action == NULL || *(action + 1) == '\0') {
-                       message(LOG | CONSOLE, "Bad inittab entry: %s", lineAsRead);
-                       continue;
-               } else {
-                       *action = '\0';
-                       ++action;
-               }
-
-               /* Separate the action from the command */
-               command = strchr(action, ':');
-               if (command == NULL || *(command + 1) == '\0') {
-                       message(LOG | CONSOLE, "Bad inittab entry: %s", lineAsRead);
-                       continue;
-               } else {
-                       *command = '\0';
-                       ++command;
-               }
-
-               /* Ok, now process it */
-               for (a = actions; a->name != 0; a++) {
-                       if (strcmp(a->name, action) == 0) {
+               if (runlev == NULL /*|| runlev[1] == '\0' - not needed */)
+                       goto bad_entry;
+               action = strchr(runlev + 1, ':');
+               if (action == NULL /*|| action[1] == '\0' - not needed */)
+                       goto bad_entry;
+               command = strchr(action + 1, ':');
+               if (command == NULL || command[1] == '\0')
+                       goto bad_entry;
+
+               *command = '\0'; /* action => ":action\0" now */
+               for (a = actions; a[0]; a += strlen(a) + 1) {
+                       if (strcmp(a + 1, action + 1) == 0) {
+                               *runlev = '\0';
                                if (*id != '\0') {
-                                       if(strncmp(id, "/dev/", 5) == 0)
+                                       if (strncmp(id, "/dev/", 5) == 0)
                                                id += 5;
                                        strcpy(tmpConsole, "/dev/");
                                        safe_strncpy(tmpConsole + 5, id,
-                                               CONSOLE_BUFF_SIZE - 5);
+                                               sizeof(tmpConsole) - 5);
                                        id = tmpConsole;
                                }
-                               new_init_action(a->action, command, id);
-                               break;
+                               new_init_action((uint8_t)a[0], command + 1, id);
+                               goto next_line;
                        }
                }
-               if (a->name == 0) {
-                       /* Choke on an unknown action */
-                       message(LOG | CONSOLE, "Bad inittab entry: %s", lineAsRead);
-               }
+               *command = ':';
+               /* Choke on an unknown action */
+ bad_entry:
+               message(L_LOG | L_CONSOLE, "Bad inittab entry: %s", id);
+ next_line: ;
        }
        fclose(file);
-       return;
-#endif                                                 /* CONFIG_FEATURE_USE_INITTAB */
 }
 
-#ifdef CONFIG_FEATURE_USE_INITTAB
 static void reload_signal(int sig ATTRIBUTE_UNUSED)
 {
        struct init_action *a, *tmp;
 
-       message(LOG, "Reloading /etc/inittab");
+       message(L_LOG, "reloading /etc/inittab");
 
        /* disable old entrys */
-       for (a = init_action_list; a; a = a->next ) {
+       for (a = init_action_list; a; a = a->next) {
                a->action = ONCE;
        }
 
        parse_inittab();
 
+       if (ENABLE_FEATURE_KILL_REMOVED) {
+               /* Be nice and send SIGTERM first */
+               for (a = init_action_list; a; a = a->next) {
+                       pid_t pid = a->pid;
+                       if ((a->action & ONCE) && pid != 0) {
+                               kill(pid, SIGTERM);
+                       }
+               }
+#if CONFIG_FEATURE_KILL_DELAY
+               if (fork() == 0) { /* child */
+                       sleep(CONFIG_FEATURE_KILL_DELAY);
+                       for (a = init_action_list; a; a = a->next) {
+                               pid_t pid = a->pid;
+                               if ((a->action & ONCE) && pid != 0) {
+                                       kill(pid, SIGKILL);
+                               }
+                       }
+                       _exit(0);
+               }
+#endif
+       }
+
        /* remove unused entrys */
        for (a = init_action_list; a; a = tmp) {
                tmp = a->next;
-               if (a->action & (ONCE | SYSINIT | WAIT ) &&
-                               a->pid == 0 ) {
+               if ((a->action & (ONCE | SYSINIT | WAIT)) && a->pid == 0) {
                        delete_init_action(a);
                }
        }
        run_actions(RESPAWN);
-       return;
 }
-#endif                                                 /* CONFIG_FEATURE_USE_INITTAB */
 
+int init_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int init_main(int argc, char **argv)
 {
        struct init_action *a;
        pid_t wpid;
-       int status;
+
+       die_sleep = 30 * 24*60*60; /* if xmalloc will ever die... */
 
        if (argc > 1 && !strcmp(argv[1], "-q")) {
-               return kill(1,SIGHUP);
+               return kill(1, SIGHUP);
        }
-#ifndef DEBUG_INIT
-       /* Expect to be invoked as init with PID=1 or be invoked as linuxrc */
-       if (getpid() != 1 &&
-               (!ENABLE_FEATURE_INITRD || !strstr(bb_applet_name, "linuxrc")))
-       {
-               bb_show_usage();
+
+       if (!ENABLE_DEBUG_INIT) {
+               /* Expect to be invoked as init with PID=1 or be invoked as linuxrc */
+               if (getpid() != 1
+                && (!ENABLE_FEATURE_INITRD || !strstr(applet_name, "linuxrc"))
+               ) {
+                       bb_show_usage();
+               }
+               /* Set up sig handlers  -- be sure to
+                * clear all of these in run() */
+               signal(SIGHUP, exec_restart_action);
+               signal(SIGQUIT, exec_restart_action);
+               signal(SIGUSR1, halt_reboot_pwoff); /* halt */
+               signal(SIGUSR2, halt_reboot_pwoff); /* poweroff */
+               signal(SIGTERM, halt_reboot_pwoff); /* reboot */
+               signal(SIGINT, ctrlaltdel_signal);
+               signal(SIGCONT, cont_handler);
+               signal(SIGSTOP, stop_handler);
+               signal(SIGTSTP, stop_handler);
+
+               /* Turn off rebooting via CTL-ALT-DEL -- we get a
+                * SIGINT on CAD so we can shut things down gracefully... */
+               init_reboot(RB_DISABLE_CAD);
        }
-       /* Set up sig handlers  -- be sure to
-        * clear all of these in run() */
-       signal(SIGHUP, exec_signal);
-       signal(SIGQUIT, exec_signal);
-       signal(SIGUSR1, halt_signal);
-       signal(SIGUSR2, halt_signal);
-       signal(SIGINT, ctrlaltdel_signal);
-       signal(SIGTERM, reboot_signal);
-       signal(SIGCONT, cont_handler);
-       signal(SIGSTOP, stop_handler);
-       signal(SIGTSTP, stop_handler);
-
-       /* Turn off rebooting via CTL-ALT-DEL -- we get a
-        * SIGINT on CAD so we can shut things down gracefully... */
-       init_reboot(RB_DISABLE_CAD);
-#endif
 
        /* Figure out where the default console should be */
        console_init();
-
-       /* Close whatever files are open, and reset the console. */
-       close(0);
-       close(1);
-       close(2);
-
-       if (device_open(console, O_RDWR | O_NOCTTY) == 0) {
-               set_term(0);
-               close(0);
-       }
-
+       set_sane_term();
        chdir("/");
        setsid();
        {
-               const char * const *e;
+               const char *const *e;
                /* Make sure environs is set to something sane */
-               for(e = environment; *e; e++)
+               for (e = environment; *e; e++)
                        putenv((char *) *e);
        }
+
+       if (argc > 1) setenv("RUNLEVEL", argv[1], 1);
+
        /* Hello world */
-       message(MAYBE_CONSOLE | LOG, "init started:  %s", bb_msg_full_version);
+       message(MAYBE_CONSOLE | L_LOG, "init started: %s", bb_banner);
 
        /* Make sure there is enough memory to do something useful. */
        if (ENABLE_SWAPONOFF) {
                struct sysinfo info;
 
                if (!sysinfo(&info) &&
-                       (info.mem_unit ? : 1) * (long long)info.totalram < MEGABYTE)
+                       (info.mem_unit ? : 1) * (long long)info.totalram < 1024*1024)
                {
-                       message(CONSOLE,"Low memory: forcing swapon.");
+                       message(L_CONSOLE, "Low memory, forcing swapon");
                        /* swapon -a requires /proc typically */
-                       new_init_action(SYSINIT, "/bin/mount -t proc proc /proc", "");
+                       new_init_action(SYSINIT, "mount -t proc proc /proc", "");
                        /* Try to turn on swap */
-                       new_init_action(SYSINIT, "/sbin/swapon -a", "");
+                       new_init_action(SYSINIT, "swapon -a", "");
                        run_actions(SYSINIT);   /* wait and removing */
                }
        }
 
        /* Check if we are supposed to be in single user mode */
-       if (argc > 1 && (!strcmp(argv[1], "single") ||
-                                        !strcmp(argv[1], "-s") || !strcmp(argv[1], "1"))) {
+       if (argc > 1
+        && (!strcmp(argv[1], "single") || !strcmp(argv[1], "-s") || LONE_CHAR(argv[1], '1'))
+       ) {
                /* Start a shell on console */
                new_init_action(RESPAWN, bb_default_login_shell, "");
        } else {
@@ -1105,24 +928,27 @@ int init_main(int argc, char **argv)
                parse_inittab();
        }
 
-#ifdef CONFIG_SELINUX
+#if ENABLE_SELINUX
        if (getenv("SELINUX_INIT") == NULL) {
                int enforce = 0;
 
-               putenv("SELINUX_INIT=YES");
+               putenv((char*)"SELINUX_INIT=YES");
                if (selinux_init_load_policy(&enforce) == 0) {
-                       execv(argv[0], argv);
+                       BB_EXECVP(argv[0], argv);
                } else if (enforce > 0) {
                        /* SELinux in enforcing mode but load_policy failed */
-                       /* At this point, we probably can't open /dev/console, so log() won't work */
-                       message(CONSOLE,"Unable to load SELinux Policy. Machine is in enforcing mode. Halting now.");
+                       message(L_CONSOLE, "Cannot load SELinux Policy. "
+                               "Machine is in enforcing mode. Halting now.");
                        exit(1);
                }
        }
 #endif /* CONFIG_SELINUX */
 
-       /* Make the command line just say "init"  -- thats all, nothing else */
-       fixup_argv(argc, argv, "init");
+       /* Make the command line just say "init"  - thats all, nothing else */
+       strncpy(argv[0], "init", strlen(argv[0]));
+       /* Wipe argv[1]-argv[N] so they don't clutter the ps listing */
+       while (*++argv)
+               memset(*argv, 0, strlen(*argv));
 
        /* Now run everything that needs to be run */
 
@@ -1135,13 +961,11 @@ int init_main(int argc, char **argv)
        /* Next run anything to be run only once */
        run_actions(ONCE);
 
-#ifdef CONFIG_FEATURE_USE_INITTAB
        /* Redefine SIGHUP to reread /etc/inittab */
-       signal(SIGHUP, reload_signal);
-#else
-       signal(SIGHUP, SIG_IGN);
-#endif /* CONFIG_FEATURE_USE_INITTAB */
-
+       if (ENABLE_FEATURE_USE_INITTAB)
+               signal(SIGHUP, reload_signal);
+       else
+               signal(SIGHUP, SIG_IGN);
 
        /* Now run the looping stuff for the rest of forever */
        while (1) {
@@ -1154,8 +978,8 @@ int init_main(int argc, char **argv)
                /* Don't consume all CPU time -- sleep a bit */
                sleep(1);
 
-               /* Wait for a child process to exit */
-               wpid = wait(&status);
+               /* Wait for any child process to exit */
+               wpid = wait(NULL);
                while (wpid > 0) {
                        /* Find out who died and clean up their corpse */
                        for (a = init_action_list; a; a = a->next) {
@@ -1163,13 +987,13 @@ int init_main(int argc, char **argv)
                                        /* Set the pid to 0 so that the process gets
                                         * restarted by run_actions() */
                                        a->pid = 0;
-                                       message(LOG, "Process '%s' (pid %d) exited.  "
+                                       message(L_LOG, "process '%s' (pid %d) exited. "
                                                        "Scheduling it for restart.",
                                                        a->command, wpid);
                                }
                        }
                        /* see if anyone else is waiting to be reaped */
-                       wpid = waitpid (-1, &status, WNOHANG);
+                       wpid = wait_any_nohang(NULL);
                }
        }
 }