A number of cleanups. Now compiles with libc5, glibc, and uClibc. Fix a few
[oweals/busybox.git] / init / init.c
index d61d1c38eb214aa3dc00dde510447cedd820c281..bf992b52c527efd0bad207d7da255e67fc778112 100644 (file)
 #define DEBUG_INIT
 */
 
-#include "internal.h"
-#include <asm/types.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <errno.h>
-#include <linux/serial.h>              /* for serial_struct */
-#include <linux/version.h>
 #include <paths.h>
 #include <signal.h>
 #include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
+#include <termios.h>
+#include <unistd.h>
+#include <limits.h>
 #include <sys/fcntl.h>
 #include <sys/ioctl.h>
-#include <sys/kdaemon.h>
 #include <sys/mount.h>
-#include <sys/reboot.h>
-#include <sys/sysinfo.h>               /* For check_free_memory() */
+#include <sys/types.h>
+#include <sys/wait.h>
+#include "busybox.h"
+#define bb_need_full_version
+#define BB_DECLARE_EXTERN
+#include "messages.c"
 #ifdef BB_SYSLOGD
 # include <sys/syslog.h>
 #endif
-#include <sys/sysmacros.h>
-#include <sys/types.h>
-#include <sys/vt.h>                            /* for vt_stat */
-#include <sys/wait.h>
-#include <termios.h>
-#include <unistd.h>
+
+
+/* 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 */
+};
+static const int VT_GETSTATE = 0x5603;  /* get global vt state info */
+
+/* From <linux/serial.h> */
+struct serial_struct {
+       int     type;
+       int     line;
+       int     port;
+       int     irq;
+       int     flags;
+       int     xmit_fifo_size;
+       int     custom_divisor;
+       int     baud_base;
+       unsigned short  close_delay;
+       char    reserved_char[2];
+       int     hub6;
+       unsigned short  closing_wait; /* time to wait before closing */
+       unsigned short  closing_wait2; /* no longer used... */
+       int     reserved[4];
+};
+
+
+
+#ifndef RB_HALT_SYSTEM
+static const int RB_HALT_SYSTEM = 0xcdef0123;
+static const int RB_ENABLE_CAD = 0x89abcdef;
+static const int RB_DISABLE_CAD = 0;
+#define RB_POWER_OFF    0x4321fedc
+static const int RB_AUTOBOOT = 0x01234567;
+#if defined(__GLIBC__) || defined (__UCLIBC__)
+#include <sys/reboot.h>
+  #define init_reboot(magic) reboot(magic)
+#else
+  #define init_reboot(magic) reboot(0xfee1dead, 672274793, magic)
+#endif
+#endif
+
+#ifndef _PATH_STDPATH
+#define _PATH_STDPATH  "/usr/bin:/bin:/usr/sbin:/sbin"
+#endif
 
 
 #if defined BB_FEATURE_INIT_COREDUMPS
 #include <sys/time.h>
 #endif
 
-#ifndef KERNEL_VERSION
 #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-#endif
+
+#if defined(__GLIBC__)
+#include <sys/kdaemon.h>
+#else
+extern int bdflush (int func, long int data);
+#endif                                                 /* __GLIBC__ */
 
 
 #define VT_PRIMARY   "/dev/tty1"     /* Primary virtual console */
 #define VT_SECONDARY "/dev/tty2"     /* Virtual console */
-#define VT_LOG       "/dev/tty3"     /* Virtual console */
+#define VT_THIRD     "/dev/tty3"     /* Virtual console */
+#define VT_FOURTH    "/dev/tty4"     /* Virtual console */
+#define VT_LOG       "/dev/tty5"     /* Virtual console */
 #define SERIAL_CON0  "/dev/ttyS0"    /* Primary serial console */
 #define SERIAL_CON1  "/dev/ttyS1"    /* Serial console */
-#define SHELL        "/bin/sh"      /* Default shell */
+#define SHELL        "-/bin/sh"             /* Default shell */
 #define INITTAB      "/etc/inittab"  /* inittab file location */
 #ifndef INIT_SCRIPT
 #define INIT_SCRIPT  "/etc/init.d/rcS"   /* Default sysinit script. */
 #endif
 
-#define LOG     0x1
-#define CONSOLE 0x2
+#define MAXENV 16              /* Number of env. vars */
+//static const int MAXENV = 16;        /* Number of env. vars */
+static const int LOG = 0x1;
+static const int CONSOLE = 0x2;
 
 /* Allowed init action types */
 typedef enum {
@@ -93,7 +144,8 @@ typedef enum {
        ASKFIRST,
        WAIT,
        ONCE,
-       CTRLALTDEL
+       CTRLALTDEL,
+       SHUTDOWN
 } initActionEnum;
 
 /* A mapping between "inittab" action name strings and action type codes. */
@@ -109,7 +161,8 @@ static const struct initActionType actions[] = {
        {"wait", WAIT},
        {"once", ONCE},
        {"ctrlaltdel", CTRLALTDEL},
-       {0}
+       {"shutdown", SHUTDOWN},
+       {0, 0}
 };
 
 /* Set up a linked list of initActions, to be read from inittab */
@@ -121,10 +174,12 @@ struct initActionTag {
        initAction *nextPtr;
        initActionEnum action;
 };
-initAction *initActionList = NULL;
+static initAction *initActionList = NULL;
 
 
 static char *secondConsole = VT_SECONDARY;
+static char *thirdConsole  = VT_THIRD;
+static char *fourthConsole = VT_FOURTH;
 static char *log           = VT_LOG;
 static int  kernelVersion  = 0;
 static char termType[32]   = "TERM=linux";
@@ -133,8 +188,11 @@ static char console[32]    = _PATH_CONSOLE;
 static void delete_initAction(initAction * action);
 
 
+
 /* Print a message to the specified device.
  * Device may be bitwise-or'd from LOG | CONSOLE */
+static void message(int device, char *fmt, ...)
+                  __attribute__ ((format (printf, 2, 3)));
 static void message(int device, char *fmt, ...)
 {
        va_list arguments;
@@ -149,7 +207,7 @@ static void message(int device, char *fmt, ...)
                va_start(arguments, fmt);
                vsnprintf(msg, sizeof(msg), fmt, arguments);
                va_end(arguments);
-               openlog("init", 0, LOG_USER);
+               openlog(applet_name, 0, LOG_USER);
                syslog(LOG_USER|LOG_INFO, msg);
                closelog();
        }
@@ -167,7 +225,6 @@ static void message(int device, char *fmt, ...)
                } else if ((log_fd = device_open(log, O_RDWR|O_NDELAY)) < 0) {
                        log_fd = -2;
                        fprintf(stderr, "Bummer, can't write to log on %s!\r\n", log);
-                       fflush(stderr);
                        log = NULL;
                        device = CONSOLE;
                }
@@ -193,15 +250,13 @@ static void message(int device, char *fmt, ...)
                        fprintf(stderr, "Bummer, can't print: ");
                        va_start(arguments, fmt);
                        vfprintf(stderr, fmt, arguments);
-                       fflush(stderr);
                        va_end(arguments);
                }
        }
 }
 
-
 /* Set terminal settings to reasonable defaults */
-void set_term(int fd)
+static void set_term(int fd)
 {
        struct termios tty;
 
@@ -237,18 +292,27 @@ void set_term(int fd)
        tcsetattr(fd, TCSANOW, &tty);
 }
 
-/* How much memory does this machine have? */
+/* How much memory does this machine have?
+   Units are kBytes to avoid overflow on 4GB machines */
 static int check_free_memory()
 {
        struct sysinfo info;
+       unsigned int result, u, s=10;
 
-       sysinfo(&info);
        if (sysinfo(&info) != 0) {
-               message(LOG, "Error checking free memory: %s\n", strerror(errno));
+               perror_msg("Error checking free memory");
                return -1;
        }
 
-       return((info.totalram+info.totalswap)/1024);
+       /* Kernels 2.0.x and 2.2.x return info.mem_unit==0 with values in bytes.
+        * Kernels 2.4.0 return info.mem_unit in bytes. */
+       u = info.mem_unit;
+       if (u==0) u=1;
+       while ( (u&1) == 0 && s > 0 ) { u>>=1; s--; }
+       result = (info.totalram>>s) + (info.totalswap>>s);
+       result = result*u;
+       if (result < 0) result = INT_MAX;
+       return result;
 }
 
 static void console_init()
@@ -312,11 +376,13 @@ static void console_init()
                /* Perhaps we should panic here? */
                snprintf(console, sizeof(console) - 1, "/dev/null");
        } else {
-               /* check for serial console and disable logging to tty3 & running a
-                  * shell to tty2 */
+               /* check for serial console and disable logging to tty5 & running a
+                  * shell to tty2-4 */
                if (ioctl(0, TIOCGSERIAL, &sr) == 0) {
                        log = NULL;
                        secondConsole = NULL;
+                       thirdConsole = NULL;
+                       fourthConsole = NULL;
                        /* Force the TERM setting to vt102 for serial console --
                         * iff TERM is set to linux (the default) */
                        if (strcmp( termType, "TERM=linux" ) == 0)
@@ -328,29 +394,65 @@ static void console_init()
        }
        message(LOG, "console=%s\n", 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);
+       strncpy(argv[0], new_argv0, len);
+
+       /* 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++;
+       }
+}
+
 
 static pid_t run(char *command, char *terminal, int get_enter)
 {
-       int i, fd;
+       int i, j;
+       int fd;
        pid_t pid;
-       char *tmpCmd;
-       char *cmd[255];
+       char *tmpCmd, *s;
+       char *cmd[255], *cmdpath;
        char buf[255];
+       struct stat sb;
        static const char press_enter[] =
 
+#ifdef CUSTOMIZED_BANNER
+#include CUSTOMIZED_BANNER
+#endif
+
                "\nPlease press Enter to activate this console. ";
-       char *environment[] = {
+       char *environment[MAXENV+1] = {
+               termType,
                "HOME=/",
                "PATH=/usr/bin:/bin:/usr/sbin:/sbin",
                "SHELL=/bin/sh",
-               termType,
                "USER=root",
-               0
+               NULL
        };
 
+       /* inherit environment to the child, merging our values -andy */
+       for (i=0; environ[i]; i++) {
+               for (j=0; environment[j]; j++) {
+                       s = strchr(environment[j], '=');
+                       if (!strncmp(environ[i], environment[j], s - environment[j]))
+                               break;
+               }
+               if (!environment[j]) {
+                       environment[j++] = environ[i];
+                       environment[j] = NULL;
+               }
+       }
 
        if ((pid = fork()) == 0) {
                /* Clean up */
+               ioctl(0, TIOCNOTTY, 0);
                close(0);
                close(1);
                close(2);
@@ -364,40 +466,21 @@ static pid_t run(char *command, char *terminal, int get_enter)
                signal(SIGHUP, SIG_DFL);
 
                if ((fd = device_open(terminal, O_RDWR)) < 0) {
+                       if (stat(terminal, &sb) != 0) {
+                               message(LOG | CONSOLE, "device '%s' does not exist.\n",
+                                               terminal);
+                               exit(1);
+                       }
                        message(LOG | CONSOLE, "Bummer, can't open %s\r\n", terminal);
                        exit(1);
                }
                dup2(fd, 0);
                dup2(fd, 1);
                dup2(fd, 2);
+               ioctl(0, TIOCSCTTY, 1);
                tcsetpgrp(0, getpgrp());
                set_term(0);
 
-               if (get_enter == TRUE) {
-                       /*
-                        * 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.
-                        */
-                       char c;
-#ifdef DEBUG_INIT
-                       pid_t shell_pgid = getpid();
-                       message(LOG, "Waiting for enter to start '%s' (pid %d, console %s)\r\n",
-                                       command, shell_pgid, terminal);
-#endif
-                       write(fileno(stdout), press_enter, sizeof(press_enter) - 1);
-                       read(fileno(stdin), &c, 1);
-               }
-
-#ifdef DEBUG_INIT
-               /* Log the process name and args */
-               message(LOG, "Starting pid %d, console %s: '%s'\r\n",
-                               shell_pgid, terminal, command);
-#endif
-
                /* See if any special /bin/sh requiring characters are present */
                if (strpbrk(command, "~`!$^&*()=|\\{}[];\"'<>?") != NULL) {
                        cmd[0] = SHELL;
@@ -409,7 +492,7 @@ static pid_t run(char *command, char *terminal, int get_enter)
                } else {
                        /* Convert command (char*) into cmd (char**, one word per string) */
                        for (tmpCmd = command, i = 0;
-                                (tmpCmd = strsep(&command, " \t")) != NULL;) {
+                                       (tmpCmd = strsep(&command, " \t")) != NULL;) {
                                if (*tmpCmd != '\0') {
                                        cmd[i] = tmpCmd;
                                        tmpCmd++;
@@ -419,24 +502,71 @@ static pid_t run(char *command, char *terminal, int get_enter)
                        cmd[i] = NULL;
                }
 
-#if defined BB_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);
+               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 = get_last_path_component(cmdpath);
+
+                       /* make a new argv[0] */
+                       if ((cmd[0] = malloc(strlen(s)+2)) == NULL) {
+                               message(LOG | CONSOLE, "malloc failed");
+                               cmd[0] = cmdpath;
+                       } else {
+                               cmd[0][0] = '-';
+                               strcpy(cmd[0]+1, s);
                        }
                }
+
+               if (get_enter == TRUE) {
+                       /*
+                        * 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.
+                        */
+#ifdef DEBUG_INIT
+                       message(LOG, "Waiting for enter to start '%s' (pid %d, console %s)\r\n",
+                                       cmd[0], getpid(), terminal);
+#endif
+                       write(fileno(stdout), press_enter, sizeof(press_enter) - 1);
+                       getc(stdin);
+               }
+
+#ifdef DEBUG_INIT
+               /* Log the process name and args */
+               message(LOG, "Starting pid %d, console %s: '%s'\r\n",
+                               getpid(), terminal, command);
+#endif
+
+#if defined BB_FEATURE_INIT_COREDUMPS
+               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);
+               }
 #endif
 
                /* Now run it.  The new program will take over this PID, 
                 * so nothing further in init.c should be run. */
-               execve(cmd[0], cmd, environment);
+               execve(cmdpath, cmd, environment);
 
                /* We're still here?  Some error happened. */
-               message(LOG | CONSOLE, "Bummer, could not run '%s': %s\n", cmd[0],
+               message(LOG | CONSOLE, "Bummer, could not run '%s': %s\n", cmdpath,
                                strerror(errno));
                exit(-1);
        }
@@ -469,8 +599,10 @@ static void check_memory()
                return;
 
        if (stat("/etc/fstab", &statBuf) == 0) {
+               /* swapon -a requires /proc typically */
+               waitfor("mount proc /proc -t proc", console, FALSE);
                /* Try to turn on swap */
-               system("/sbin/swapon -a");
+               waitfor("swapon -a", console, FALSE);
                if (check_free_memory() < 1000)
                        goto goodnight;
        } else
@@ -485,11 +617,12 @@ static void check_memory()
 }
 
 /* Run all commands to be run right before halt/reboot */
-static void run_lastAction(void)
+static void run_actions(initActionEnum action)
 {
-       initAction *a;
-       for (a = initActionList; a; a = a->nextPtr) {
-               if (a->action == CTRLALTDEL) {
+       initAction *a, *tmp;
+       for (a = initActionList; a; a = tmp) {
+               tmp = a->nextPtr;
+               if (a->action == action) {
                        waitfor(a->process, a->console, FALSE);
                        delete_initAction(a);
                }
@@ -505,7 +638,7 @@ static void shutdown_system(void)
        signal(SIGHUP, SIG_DFL);
 
        /* Allow Ctrl-Alt-Del to reboot system. */
-       reboot(RB_ENABLE_CAD);
+       init_reboot(RB_ENABLE_CAD);
 
        message(CONSOLE|LOG, "\r\nThe system is going down NOW !!\r\n");
        sync();
@@ -521,10 +654,10 @@ static void shutdown_system(void)
        sleep(1);
 
        /* run everything to be run at "ctrlaltdel" */
-       run_lastAction();
+       run_actions(SHUTDOWN);
 
        sync();
-       if (kernelVersion > 0 && kernelVersion <= 2 * 65536 + 2 * 256 + 11) {
+       if (kernelVersion > 0 && kernelVersion <= KERNEL_VERSION(2,2,11)) {
                /* bdflush, kupdate not needed for kernels >2.2.11 */
                bdflush(1, 0);
                sync();
@@ -543,12 +676,10 @@ static void halt_signal(int sig)
        /* allow time for last message to reach serial console */
        sleep(2);
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0)
-       if (sig == SIGUSR2)
-               reboot(RB_POWER_OFF);
+       if (sig == SIGUSR2 && kernelVersion >= KERNEL_VERSION(2,2,0))
+               init_reboot(RB_POWER_OFF);
        else
-#endif
-               reboot(RB_HALT_SYSTEM);
+               init_reboot(RB_HALT_SYSTEM);
        exit(0);
 }
 
@@ -561,101 +692,18 @@ static void reboot_signal(int sig)
        /* allow time for last message to reach serial console */
        sleep(2);
 
-       reboot(RB_AUTOBOOT);
+       init_reboot(RB_AUTOBOOT);
        exit(0);
 }
 
-#if defined BB_FEATURE_INIT_CHROOT
-
-#if ! defined BB_FEATURE_USE_PROCFS
-#error Sorry, I depend on the /proc filesystem right now.
-#endif
-
-static void check_chroot(int sig)
+static void ctrlaltdel_signal(int sig)
 {
-       char *argv_init[2] = { "init", NULL, };
-       char *envp_init[3] = { "HOME=/", "TERM=linux", NULL, };
-       char rootpath[256], *tc;
-       int fd;
-
-       if ((fd = open("/proc/sys/kernel/init-chroot", O_RDONLY)) == -1) {
-               message(CONSOLE,
-                               "SIGHUP recived, but could not open proc file\r\n");
-               sleep(2);
-               return;
-       }
-       if (read(fd, rootpath, sizeof(rootpath)) == -1) {
-               message(CONSOLE,
-                               "SIGHUP recived, but could not read proc file\r\n");
-               sleep(2);
-               return;
-       }
-       close(fd);
-
-       if (rootpath[0] == '\0') {
-               message(CONSOLE,
-                               "SIGHUP recived, but new root is not valid: %s\r\n",
-                               rootpath);
-               sleep(2);
-               return;
-       }
-
-       tc = strrchr(rootpath, '\n');
-       *tc = '\0';
-
-       /* Ok, making it this far means we commit */
-       message(CONSOLE, "Please stand by, changing root to `%s'.\r\n",
-                       rootpath);
-
-       /* kill all other programs first */
-       message(CONSOLE, "Sending SIGTERM to all processes.\r\n");
-       kill(-1, SIGTERM);
-       sleep(2);
-       sync();
-
-       message(CONSOLE, "Sending SIGKILL to all processes.\r\n");
-       kill(-1, SIGKILL);
-       sleep(2);
-       sync();
-
-       /* ok, we don't need /proc anymore. we also assume that the signaling
-        * process left the rest of the filesystems alone for us */
-       umount("/proc");
-
-       /* Ok, now we chroot. Hopefully we only have two things mounted, the
-        * new chroot'd mount point, and the old "/" mount. s,
-        * we go ahead and unmount the old "/". This should trigger the kernel
-        * to set things up the Right Way(tm). */
-
-       if (!chroot(rootpath))
-               umount("/dev/root");
-
-       /* If the chroot fails, we are already too far to turn back, so we
-        * continue and hope that executing init below will revive the system */
-
-       /* close all of our descriptors and open new ones */
-       close(0);
-       close(1);
-       close(2);
-       open("/dev/console", O_RDWR, 0);
-       dup(0);
-       dup(0);
-
-       message(CONSOLE, "Executing real init...\r\n");
-       /* execute init in the (hopefully) new root */
-       execve("/sbin/init", argv_init, envp_init);
-
-       message(CONSOLE,
-                       "ERROR: Could not exec new init. Press %s to reboot.\r\n",
-                       (secondConsole == NULL) /* serial console */
-                       ? "Reset" : "CTRL-ALT-DEL");
-       return;
+       run_actions(CTRLALTDEL);
 }
-#endif                                                 /* BB_FEATURE_INIT_CHROOT */
 
 #endif                                                 /* ! DEBUG_INIT */
 
-void new_initAction(initActionEnum action, char *process, char *cons)
+static void new_initAction(initActionEnum action, char *process, char *cons)
 {
        initAction *newAction;
 
@@ -710,12 +758,12 @@ static void delete_initAction(initAction * action)
  * _is_ defined, but /etc/inittab is missing, this 
  * results in the same set of default behaviors.
  * */
-void parse_inittab(void)
+static void parse_inittab(void)
 {
 #ifdef BB_FEATURE_USE_INITTAB
        FILE *file;
        char buf[256], lineAsRead[256], tmpConsole[256];
-       char *p, *q, *r, *s;
+       char *id, *runlev, *action, *process, *eol;
        const struct initActionType *a = actions;
        int foundIt;
 
@@ -724,15 +772,23 @@ void parse_inittab(void)
        if (file == NULL) {
                /* No inittab file -- set up some default behavior */
 #endif
+               /* Reboot on Ctrl-Alt-Del */
+               new_initAction(CTRLALTDEL, "/sbin/reboot", console);
                /* Swapoff on halt/reboot */
-               new_initAction(CTRLALTDEL, "/sbin/swapoff -a > /dev/null 2>&1", console);
+               new_initAction(SHUTDOWN, "/sbin/swapoff -a", console);
                /* Umount all filesystems on halt/reboot */
-               new_initAction(CTRLALTDEL, "/bin/umount -a -r > /dev/null 2>&1", console);
+               new_initAction(SHUTDOWN, "/bin/umount -a -r", console);
                /* Askfirst shell on tty1 */
                new_initAction(ASKFIRST, SHELL, console);
                /* Askfirst shell on tty2 */
                if (secondConsole != NULL)
                        new_initAction(ASKFIRST, SHELL, secondConsole);
+               /* Askfirst shell on tty3 */
+               if (thirdConsole != NULL)
+                       new_initAction(ASKFIRST, SHELL, thirdConsole);
+               /* Askfirst shell on tty4 */
+               if (fourthConsole != NULL)
+                       new_initAction(ASKFIRST, SHELL, fourthConsole);
                /* sysinit */
                new_initAction(SYSINIT, INIT_SCRIPT, console);
 
@@ -742,64 +798,61 @@ void parse_inittab(void)
 
        while (fgets(buf, 255, file) != NULL) {
                foundIt = FALSE;
-               for (p = buf; *p == ' ' || *p == '\t'; p++);
-               if (*p == '#' || *p == '\n')
+               /* Skip leading spaces */
+               for (id = buf; *id == ' ' || *id == '\t'; id++);
+
+               /* Skip the line if it's a comment */
+               if (*id == '#' || *id == '\n')
                        continue;
 
                /* Trim the trailing \n */
-               q = strrchr(p, '\n');
-               if (q != NULL)
-                       *q = '\0';
+               eol = strrchr(id, '\n');
+               if (eol != NULL)
+                       *eol = '\0';
 
                /* Keep a copy around for posterity's sake (and error msgs) */
                strcpy(lineAsRead, buf);
 
-               /* Grab the ID field */
-               s = p;
-               p = strchr(p, ':');
-               if (p != NULL || *(p + 1) != '\0') {
-                       *p = '\0';
-                       ++p;
+               /* Separate the ID field from the runlevels */
+               runlev = strchr(id, ':');
+               if (runlev == NULL || *(runlev + 1) == '\0') {
+                       message(LOG | CONSOLE, "Bad inittab entry: %s\n", lineAsRead);
+                       continue;
+               } else {
+                       *runlev = '\0';
+                       ++runlev;
                }
 
-               /* Now peel off the process field from the end
-                * of the string */
-               q = strrchr(p, ':');
-               if (q == NULL || *(q + 1) == '\0') {
+               /* Separate the runlevels from the action */
+               action = strchr(runlev, ':');
+               if (action == NULL || *(action + 1) == '\0') {
                        message(LOG | CONSOLE, "Bad inittab entry: %s\n", lineAsRead);
                        continue;
                } else {
-                       *q = '\0';
-                       ++q;
+                       *action = '\0';
+                       ++action;
                }
 
-               /* Now peel off the action field */
-               r = strrchr(p, ':');
-               if (r == NULL || *(r + 1) == '\0') {
+               /* Separate the action from the process */
+               process = strchr(action, ':');
+               if (process == NULL || *(process + 1) == '\0') {
                        message(LOG | CONSOLE, "Bad inittab entry: %s\n", lineAsRead);
                        continue;
                } else {
-                       ++r;
+                       *process = '\0';
+                       ++process;
                }
 
                /* Ok, now process it */
                a = actions;
                while (a->name != 0) {
-                       if (strcmp(a->name, r) == 0) {
-                               if (*s != '\0') {
-                                       struct stat statBuf;
-
+                       if (strcmp(a->name, action) == 0) {
+                               if (*id != '\0') {
                                        strcpy(tmpConsole, "/dev/");
-                                       strncat(tmpConsole, s, 200);
-                                       if (stat(tmpConsole, &statBuf) != 0) {
-                                               message(LOG | CONSOLE,
-                                                               "device '%s' does not exist.  Did you read the directions?\n",
-                                                               tmpConsole);
-                                               break;
-                                       }
-                                       s = tmpConsole;
+                                       strncat(tmpConsole, id, 200);
+                                       id = tmpConsole;
                                }
-                               new_initAction(a->action, q, s);
+                               new_initAction(a->action, process, id);
                                foundIt = TRUE;
                        }
                        a++;
@@ -819,7 +872,7 @@ void parse_inittab(void)
 
 extern int init_main(int argc, char **argv)
 {
-       initAction *a;
+       initAction *a, *tmp;
        pid_t wpid;
        int status;
 
@@ -827,27 +880,22 @@ extern int init_main(int argc, char **argv)
        /* Expect to be invoked as init with PID=1 or be invoked as linuxrc */
        if (getpid() != 1
 #ifdef BB_FEATURE_LINUXRC
-                       && strstr(argv[0], "linuxrc") == NULL
+                       && strstr(applet_name, "linuxrc") == NULL
 #endif
                          )
        {
-                       usage("init\n\nInit is the parent of all processes.\n\n"
-                                 "This version of init is designed to be run only "
-                                 "by the kernel.\n");
+                       show_usage();
        }
        /* Set up sig handlers  -- be sure to
         * clear all of these in run() */
        signal(SIGUSR1, halt_signal);
-       signal(SIGUSR2, reboot_signal);
-       signal(SIGINT, reboot_signal);
+       signal(SIGUSR2, halt_signal);
+       signal(SIGINT, ctrlaltdel_signal);
        signal(SIGTERM, reboot_signal);
-#if defined BB_FEATURE_INIT_CHROOT
-       signal(SIGHUP, check_chroot);
-#endif
 
        /* Turn off rebooting via CTL-ALT-DEL -- we get a 
         * SIGINT on CAD so we can shut things down gracefully... */
-       reboot(RB_DISABLE_CAD);
+       init_reboot(RB_DISABLE_CAD);
 #endif
 
        /* Figure out what kernel this is running */
@@ -865,7 +913,7 @@ extern int init_main(int argc, char **argv)
        setsid();
 
        /* Make sure PATH is set to something sane */
-       putenv(_PATH_STDPATH);
+       putenv("PATH="_PATH_STDPATH);
 
        /* Hello world */
 #ifndef DEBUG_INIT
@@ -874,16 +922,14 @@ extern int init_main(int argc, char **argv)
                        CONSOLE|
 #endif
                        LOG,
-                       "init started:  BusyBox v%s (%s) multi-call binary\r\n",
-                       BB_VER, BB_BT);
+                       "init started:  %s\r\n", full_version);
 #else
        message(
 #if ! defined BB_FEATURE_EXTRA_QUIET
                        CONSOLE|
 #endif
                        LOG,
-                       "init(%d) started:  BusyBox v%s (%s) multi-call binary\r\n",
-                       getpid(), BB_VER, BB_BT);
+                       "init(%d) started:  %s\r\n", getpid(), full_version);
 #endif
 
 
@@ -893,9 +939,13 @@ extern int init_main(int argc, char **argv)
        /* 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"))) {
-               /* Ask first then start a shell on tty2 */
+               /* Ask first then start a shell on tty2-4 */
                if (secondConsole != NULL)
                        new_initAction(ASKFIRST, SHELL, secondConsole);
+               if (thirdConsole != NULL)
+                       new_initAction(ASKFIRST, SHELL, thirdConsole);
+               if (fourthConsole != NULL)
+                       new_initAction(ASKFIRST, SHELL, fourthConsole);
                /* Start a shell on tty1 */
                new_initAction(RESPAWN, SHELL, console);
        } else {
@@ -908,15 +958,14 @@ extern int init_main(int argc, char **argv)
                parse_inittab();
        }
 
-       /* Fix up argv[0] to be certain we claim to be init */
-       strncpy(argv[0], "init", strlen(argv[0])+1);
-       if (argc > 1)
-               strncpy(argv[1], "\0", strlen(argv[1])+1);
+       /* Make the command line just say "init"  -- thats all, nothing else */
+       fixup_argv(argc, argv, "init");
 
        /* Now run everything that needs to be run */
 
        /* First run the sysinit command */
-       for (a = initActionList; a; a = a->nextPtr) {
+       for (a = initActionList; a; a = tmp) {
+               tmp = a->nextPtr;
                if (a->action == SYSINIT) {
                        waitfor(a->process, a->console, FALSE);
                        /* Now remove the "sysinit" entry from the list */
@@ -924,7 +973,8 @@ extern int init_main(int argc, char **argv)
                }
        }
        /* Next run anything that wants to block */
-       for (a = initActionList; a; a = a->nextPtr) {
+       for (a = initActionList; a; a = tmp) {
+               tmp = a->nextPtr;
                if (a->action == WAIT) {
                        waitfor(a->process, a->console, FALSE);
                        /* Now remove the "wait" entry from the list */
@@ -932,7 +982,8 @@ extern int init_main(int argc, char **argv)
                }
        }
        /* Next run anything to be run only once */
-       for (a = initActionList; a; a = a->nextPtr) {
+       for (a = initActionList; a; a = tmp) {
+               tmp = a->nextPtr;
                if (a->action == ONCE) {
                        run(a->process, a->console, FALSE);
                        /* Now remove the "once" entry from the list */