Remove gratuitous and unnecessary "BusyBox" refernece in login prompt
[oweals/busybox.git] / init / init.c
index 408dd1f95eb26caa612183cfd5b12bf2cf326949..79ab78fc240f23d09e4d1395d7e1518744d5d753 100644 (file)
@@ -2,8 +2,8 @@
 /*
  * Mini init implementation for busybox
  *
- *
  * Copyright (C) 1995, 1996 by Bruce Perens <bruce@pixar.com>.
+ * Copyright (C) 1999-2002 by Erik Andersen <andersee@debian.org>
  * Adjusted by so many folks, it's impossible to keep track.
  *
  * This program is free software; you can redistribute it and/or modify
 #define fork   vfork
 #endif
 
+#define INIT_BUFFS_SIZE 256
+
 /* 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 */
+       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 */
+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];
+       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];
 };
 
 
-#if (__GNU_LIBRARY__ > 5) || defined(__dietlibc__) 
-  #include <sys/reboot.h>
-  #define init_reboot(magic) reboot(magic)
+#if (__GNU_LIBRARY__ > 5) || defined(__dietlibc__)
+#include <sys/reboot.h>
+#define init_reboot(magic) reboot(magic)
 #else
-  #define init_reboot(magic) reboot(0xfee1dead, 672274793, magic)
+#define init_reboot(magic) reboot(0xfee1dead, 672274793, magic)
 #endif
 
 #ifndef _PATH_STDPATH
@@ -104,16 +106,16 @@ struct serial_struct {
 #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
 
 #if __GNU_LIBRARY__ > 5
-       #include <sys/kdaemon.h>
+#include <sys/kdaemon.h>
 #else
-       extern int bdflush (int func, long int data);
+extern int bdflush(int func, long int data);
 #endif
 
-#define SHELL        "/bin/sh"      /* Default shell */
-#define LOGIN_SHELL  "-" SHELL      /* Default login shell */
-#define INITTAB      "/etc/inittab"  /* inittab file location */
+#define SHELL        "/bin/sh" /* Default shell */
+#define LOGIN_SHELL  "-" SHELL /* Default login shell */
+#define INITTAB      "/etc/inittab"    /* inittab file location */
 #ifndef INIT_SCRIPT
-#define INIT_SCRIPT  "/etc/init.d/rcS"   /* Default sysinit script. */
+#define INIT_SCRIPT  "/etc/init.d/rcS" /* Default sysinit script. */
 #endif
 
 #define MAXENV 16              /* Number of env. vars */
@@ -149,25 +151,26 @@ static const struct init_action_type actions[] = {
 /* Set up a linked list of init_actions, to be read from inittab */
 struct init_action {
        pid_t pid;
-       char command[256];
-       char terminal[256];
+       char command[INIT_BUFFS_SIZE];
+       char terminal[INIT_BUFFS_SIZE];
        struct init_action *next;
        int action;
 };
 
 /* Static variables */
 static struct init_action *init_action_list = NULL;
-static char *secondConsole = VC_2;
-static char *thirdConsole  = VC_3;
-static char *fourthConsole = VC_4;
-static char *log           = VC_5;
-static int  kernelVersion  = 0;
-static char termType[32]   = "TERM=linux";
-static char console[32]    = _PATH_CONSOLE;
+static int kernelVersion = 0;
+static char termType[32] = "TERM=linux";
+static char console[32] = _PATH_CONSOLE;
+
+#ifndef CONFIG_SYSLOGD
+static char *log = VC_5;
+#endif
 static sig_atomic_t got_cont = 0;
 static const int LOG = 0x1;
 static const int CONSOLE = 0x2;
-#if defined BB_FEATURE_EXTRA_QUIET
+
+#if defined CONFIG_FEATURE_EXTRA_QUIET
 static const int MAYBE_CONSOLE = 0x0;
 #else
 #define MAYBE_CONSOLE  CONSOLE
@@ -176,6 +179,7 @@ static const int MAYBE_CONSOLE = 0x0;
 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;
 #endif
@@ -188,17 +192,20 @@ static int waitfor(struct init_action *a);
 static void loop_forever(void)
 {
        while (1)
-               sleep (1);
+               sleep(1);
 }
 
 /* Print a message to the specified device.
  * Device may be bitwise-or'd from LOG | CONSOLE */
 #ifdef DEBUG_INIT
-static inline messageND(int device, char *fmt, ...) { }
-#else 
+static inline messageND(int device, char *fmt, ...)
+{
+}
+#else
 #define messageND message
 #endif
-static void message(int device, char *fmt, ...) __attribute__ ((format (printf, 2, 3)));
+static void message(int device, char *fmt, ...)
+       __attribute__ ((format(printf, 2, 3)));
 static void message(int device, char *fmt, ...)
 {
        va_list arguments;
@@ -221,16 +228,12 @@ static void message(int device, char *fmt, ...)
        /* Take full control of the log tty, and never close it.
         * It's mine, all mine!  Muhahahaha! */
        if (log_fd < 0) {
-               if (log == NULL) {
-                       /* don't even try to log, because there is no such console */
-                       log_fd = -2;
-                       /* log to main console instead */
-                       device = CONSOLE;
-               } else if ((log_fd = device_open(log, O_RDWR|O_NDELAY)) < 0) {
+               if ((log_fd = device_open(log, O_RDWR | O_NDELAY)) < 0) {
                        log_fd = -2;
                        fprintf(stderr, "Bummer, can't write to log on %s!\n", log);
-                       log = NULL;
                        device = CONSOLE;
+               } else {
+                       fcntl(log_fd, F_SETFD, FD_CLOEXEC);
                }
        }
        if ((device & LOG) && (log_fd >= 0)) {
@@ -242,9 +245,9 @@ static void message(int device, char *fmt, ...)
 
        if (device & CONSOLE) {
                /* Always send console messages to /dev/console so people will see them. */
-               if (
-                       (fd =
-                        device_open(_PATH_CONSOLE, O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0) {
+               if ((fd =
+                        device_open(_PATH_CONSOLE,
+                                                O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0) {
                        va_start(arguments, fmt);
                        vdprintf(fd, fmt, arguments);
                        va_end(arguments);
@@ -266,21 +269,21 @@ static void set_term(int fd)
        tcgetattr(fd, &tty);
 
        /* set control chars */
-       tty.c_cc[VINTR]  = 3;   /* C-c */
-       tty.c_cc[VQUIT]  = 28;  /* C-\ */
-       tty.c_cc[VERASE] = 127; /* C-? */
-       tty.c_cc[VKILL]  = 21;  /* C-u */
-       tty.c_cc[VEOF]   = 4;   /* C-d */
+       tty.c_cc[VINTR] = 3;    /* C-c */
+       tty.c_cc[VQUIT] = 28;   /* C-\ */
+       tty.c_cc[VERASE] = 127; /* C-? */
+       tty.c_cc[VKILL] = 21;   /* C-u */
+       tty.c_cc[VEOF] = 4;     /* C-d */
        tty.c_cc[VSTART] = 17;  /* C-q */
-       tty.c_cc[VSTOP]  = 19;  /* C-s */
-       tty.c_cc[VSUSP]  = 26;  /* C-z */
+       tty.c_cc[VSTOP] = 19;   /* C-s */
+       tty.c_cc[VSUSP] = 26;   /* C-z */
 
        /* use line dicipline 0 */
        tty.c_line = 0;
 
        /* Make it be sane */
-       tty.c_cflag &= CBAUD|CBAUDEX|CSIZE|CSTOPB|PARENB|PARODD;
-       tty.c_cflag |= CREAD|HUPCL|CLOCAL;
+       tty.c_cflag &= CBAUD | CBAUDEX | CSIZE | CSTOPB | PARENB | PARODD;
+       tty.c_cflag |= CREAD | HUPCL | CLOCAL;
 
 
        /* input modes */
@@ -301,7 +304,7 @@ static void set_term(int fd)
 static int check_free_memory(void)
 {
        struct sysinfo info;
-       unsigned int result, u, s=10;
+       unsigned int result, u, s = 10;
 
        if (sysinfo(&info) != 0) {
                perror_msg("Error checking free memory");
@@ -311,11 +314,16 @@ static int check_free_memory(void)
        /* 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;
+       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;
 }
 
@@ -379,28 +387,22 @@ static void console_init(void)
                /* Perhaps we should panic here? */
                safe_strncpy(console, "/dev/null", sizeof(console));
        } else {
-               /* check for serial console and disable logging to tty5 & 
-                * running a shell to tty2-4 */
+               /* check for serial console */
                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)
+                        * if TERM is set to linux (the default) */
+                       if (strcmp(termType, "TERM=linux") == 0)
                                safe_strncpy(termType, "TERM=vt102", sizeof(termType));
-                       message(LOG | CONSOLE,
-                                       "serial console detected.  Disabling virtual terminals.\n");
                }
                close(fd);
        }
        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);
@@ -437,19 +439,19 @@ static void check_memory(void)
 #endif
 
   goodnight:
-       message(CONSOLE,
-                       "Sorry, your computer does not have enough memory.\n");
+       message(CONSOLE, "\rSorry, your computer does not have enough memory.\n");
        loop_forever();
 }
 
 static pid_t run(struct init_action *a)
 {
        struct stat sb;
-       int i, j, fd, junk; 
+       int i, j, junk;
        pid_t pid, pgrp, tmp_pid;
-       char *s, *tmpCmd, *cmd[255], *cmdpath, buf[255];
+       char *s, *tmpCmd, *cmd[INIT_BUFFS_SIZE], *cmdpath;
+       char buf[INIT_BUFFS_SIZE + 6];  /* INIT_BUFFS_SIZE+strlen("exec ")+1 */
        sigset_t nmask, omask;
-       char *environment[MAXENV+1] = {
+       char *environment[MAXENV + 1] = {
                termType,
                "HOME=/",
                "PATH=" _PATH_STDPATH,
@@ -464,8 +466,8 @@ static pid_t run(struct init_action *a)
                "\nPlease press Enter to activate this console. ";
 
        /* inherit environment to the child, merging our values -andy */
-       for (i=0; environ[i]; i++) {
-               for (j=0; environment[j]; j++) {
+       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;
@@ -481,51 +483,48 @@ static pid_t run(struct init_action *a)
        sigaddset(&nmask, SIGCHLD);
        sigprocmask(SIG_BLOCK, &nmask, &omask);
 
-       if ((pid = fork()) == 0) 
-       {
+       if ((pid = fork()) == 0) {
                /* Clean up */
-               ioctl(0, TIOCNOTTY, 0);
                close(0);
                close(1);
                close(2);
                sigprocmask(SIG_SETMASK, &omask, NULL);
 
-               /* Create a new session and make ourself the process group leader */
-               setsid();
-
                /* Reset signal handlers that were set by the parent process */
                signal(SIGUSR1, SIG_DFL);
                signal(SIGUSR2, SIG_DFL);
-               signal(SIGINT,  SIG_DFL);
+               signal(SIGINT, SIG_DFL);
                signal(SIGTERM, SIG_DFL);
-               signal(SIGHUP,  SIG_DFL);
+               signal(SIGHUP, 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 */
-               if ((fd = device_open(a->terminal, O_RDWR|O_NOCTTY)) < 0) {
+               if ((device_open(a->terminal, O_RDWR)) < 0) {
                        if (stat(a->terminal, &sb) != 0) {
-                               message(LOG | CONSOLE, "device '%s' does not exist.\n",
+                               message(LOG | CONSOLE, "\rdevice '%s' does not exist.\n",
                                                a->terminal);
                                _exit(1);
                        }
-                       message(LOG | CONSOLE, "Bummer, can't open %s\n", a->terminal);
+                       message(LOG | CONSOLE, "\rBummer, can't open %s\n", a->terminal);
                        _exit(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 up to wait, then force the
+               /* 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)) {
-
-                       /* Take over the controlling tty */
-                       ioctl(fd, TIOCSCTTY, 1);
-                       /* Setup stdin, stdout, stderr for the new process so 
-                        * they point to the supplied terminal */
-                       dup(fd);
-                       dup(fd);
+               if (a->action & (SYSINIT | WAIT | CTRLALTDEL | SHUTDOWN | RESTART)) {
 
                        /* Now fork off another process to just hang around */
                        if ((pid = fork()) < 0) {
@@ -542,27 +541,24 @@ static pid_t run(struct init_action *a)
                                signal(SIGCHLD, SIG_DFL);
 
                                /* Wait for child to exit */
-                               while ((tmp_pid = waitpid(pid, &junk, 0)) != pid) {
-                                       if (tmp_pid < 0 && errno == ECHILD)
-                                               break;
-                               }
+                               while ((tmp_pid = waitpid(pid, &junk, 0)) != pid);
 
                                /* See if stealing the controlling tty back is necessary */
-                               pgrp = tcgetpgrp(tmp_pid);
+                               pgrp = tcgetpgrp(0);
                                if (pgrp != getpid())
                                        _exit(0);
 
                                /* Use a temporary process to steal the controlling tty. */
                                if ((pid = fork()) < 0) {
-                                       message(LOG | CONSOLE, "Can't fork!\n");
+                                       message(LOG | CONSOLE, "\rCan't fork!\n");
                                        _exit(1);
-                               }       
+                               }
                                if (pid == 0) {
                                        setsid();
-                                       ioctl(tmp_pid, TIOCSCTTY, 1);
+                                       ioctl(0, TIOCSCTTY, 1);
                                        _exit(0);
-                               }       
-                               while((tmp_pid = waitpid(pid, &junk, 0)) != pid) {
+                               }
+                               while ((tmp_pid = waitpid(pid, &junk, 0)) != pid) {
                                        if (tmp_pid < 0 && errno == ECHILD)
                                                break;
                                }
@@ -570,29 +566,22 @@ static pid_t run(struct init_action *a)
                        }
 
                        /* Now fall though to actually execute things */
-               } else {
-                       dup(fd);
-                       dup(fd);
                }
 
                /* See if any special /bin/sh requiring characters are present */
                if (strpbrk(a->command, "~`!$^&*()=|\\{}[];\"'<>?") != NULL) {
                        cmd[0] = SHELL;
                        cmd[1] = "-c";
-                       strcpy(buf, "exec ");
-                       safe_strncpy(buf + sizeof("exec "), a->command, 
-                                       sizeof(buf) - sizeof("exec "));
+                       strcat(strcpy(buf, "exec "), a->command);
                        cmd[2] = buf;
                        cmd[3] = NULL;
                } else {
                        /* Convert command (char*) into cmd (char**, one word per string) */
-                       safe_strncpy(buf, a->command, sizeof(buf));
+                       strcpy(buf, a->command);
                        s = buf;
-                       for (tmpCmd = buf, i = 0;
-                                       (tmpCmd = strsep(&s, " \t")) != NULL;) {
+                       for (tmpCmd = buf, i = 0; (tmpCmd = strsep(&s, " \t")) != NULL;) {
                                if (*tmpCmd != '\0') {
                                        cmd[i] = tmpCmd;
-                                       tmpCmd++;
                                        i++;
                                }
                        }
@@ -617,12 +606,12 @@ static pid_t run(struct init_action *a)
                        s = get_last_path_component(cmdpath);
 
                        /* make a new argv[0] */
-                       if ((cmd[0] = malloc(strlen(s)+2)) == NULL) {
+                       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);
+                               strcpy(cmd[0] + 1, s);
                        }
                }
 
@@ -635,19 +624,22 @@ static pid_t run(struct init_action *a)
                         * be allowed to start a shell or whatever an init script 
                         * specifies.
                         */
-                       messageND(LOG, "Waiting for enter to start '%s' (pid %d, terminal %s)\n",
-                                       cmdpath, getpid(), a->terminal);
+                       messageND(LOG,
+                                         "Waiting for enter to start '%s' (pid %d, terminal %s)\n",
+                                         cmdpath, getpid(), a->terminal);
+                       fflush(stdout);
                        write(fileno(stdout), press_enter, sizeof(press_enter) - 1);
                        getc(stdin);
                }
 
                /* Log the process name and args */
                messageND(LOG, "Starting pid %d, console %s: '%s'\n",
-                               getpid(), a->terminal, cmdpath);
+                                 getpid(), a->terminal, cmdpath);
 
 #if defined CONFIG_FEATURE_INIT_COREDUMPS
-               if (stat (CORE_ENABLE_FLAG_FILE, &sb) == 0) {
+               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);
@@ -659,8 +651,7 @@ static pid_t run(struct init_action *a)
                execve(cmdpath, cmd, environment);
 
                /* We're still here?  Some error happened. */
-               message(LOG | CONSOLE, "Bummer, could not run '%s': %s\n", cmdpath,
-                               strerror(errno));
+               message(LOG | CONSOLE, "\rBummer, could not run '%s': %m\n", cmdpath);
                _exit(-1);
        }
        sigprocmask(SIG_SETMASK, &omask, NULL);
@@ -669,7 +660,7 @@ static pid_t run(struct init_action *a)
 
 static int waitfor(struct init_action *a)
 {
-       int pid; 
+       int pid;
        int status, wpid;
 
        pid = run(a);
@@ -692,13 +683,13 @@ static void run_actions(int action)
        for (a = init_action_list; a; a = tmp) {
                tmp = a->next;
                if (a->action == action) {
-                       if (a->action & (SYSINIT|WAIT|CTRLALTDEL|SHUTDOWN|RESTART)) {
+                       if (a->action & (SYSINIT | WAIT | CTRLALTDEL | SHUTDOWN | RESTART)) {
                                waitfor(a);
                                delete_init_action(a);
                        } else if (a->action & ONCE) {
                                run(a);
                                delete_init_action(a);
-                       } else if (a->action & (RESPAWN|ASKFIRST)) {
+                       } else if (a->action & (RESPAWN | ASKFIRST)) {
                                /* Only run stuff with pid==0.  If they have
                                 * a pid, that means it is still running */
                                if (a->pid == 0) {
@@ -715,6 +706,11 @@ static void shutdown_system(void)
 {
        sigset_t block_signals;
 
+       /* run everything to be run at "shutdown".  This is done _prior_
+        * to killing everything, in case people wish to use scripts to
+        * shut things down gracefully... */
+       run_actions(SHUTDOWN);
+
        /* first disable all our signals */
        sigemptyset(&block_signals);
        sigaddset(&block_signals, SIGHUP);
@@ -731,24 +727,21 @@ static void shutdown_system(void)
        /* Allow Ctrl-Alt-Del to reboot system. */
        init_reboot(RB_ENABLE_CAD);
 
-       message(CONSOLE|LOG, "\nThe system is going down NOW !!\n");
+       message(CONSOLE | LOG, "\n\rThe system is going down NOW !!\n");
        sync();
 
        /* Send signals to every process _except_ pid 1 */
-       message(CONSOLE|LOG, "Sending SIGTERM to all processes.\n");
+       message(CONSOLE | LOG, "\rSending SIGTERM to all processes.\n");
        kill(-1, SIGTERM);
        sleep(1);
        sync();
 
-       message(CONSOLE|LOG, "Sending SIGKILL to all processes.\n");
+       message(CONSOLE | LOG, "\rSending SIGKILL to all processes.\n");
        kill(-1, SIGKILL);
        sleep(1);
 
-       /* run everything to be run at "shutdown" */
-       run_actions(SHUTDOWN);
-
        sync();
-       if (kernelVersion > 0 && kernelVersion <= KERNEL_VERSION(2,2,11)) {
+       if (kernelVersion > 0 && kernelVersion <= KERNEL_VERSION(2, 2, 11)) {
                /* bdflush, kupdate not needed for kernels >2.2.11 */
                bdflush(1, 0);
                sync();
@@ -758,15 +751,31 @@ static void shutdown_system(void)
 static void exec_signal(int sig)
 {
        struct init_action *a, *tmp;
+       sigset_t unblock_signals;
+
        for (a = init_action_list; a; a = tmp) {
                tmp = a->next;
                if (a->action & RESTART) {
                        shutdown_system();
-                       message(CONSOLE|LOG, "Trying to re-exec %s\n", a->command);
+
+                       /* unblock all signals, blocked in shutdown_system() */
+                       sigemptyset(&unblock_signals);
+                       sigaddset(&unblock_signals, SIGHUP);
+                       sigaddset(&unblock_signals, SIGCHLD);
+                       sigaddset(&unblock_signals, SIGUSR1);
+                       sigaddset(&unblock_signals, SIGUSR2);
+                       sigaddset(&unblock_signals, SIGINT);
+                       sigaddset(&unblock_signals, SIGTERM);
+                       sigaddset(&unblock_signals, SIGCONT);
+                       sigaddset(&unblock_signals, SIGSTOP);
+                       sigaddset(&unblock_signals, SIGTSTP);
+                       sigprocmask(SIG_UNBLOCK, &unblock_signals, NULL);
+
+                       message(CONSOLE | LOG, "\rTrying to re-exec %s\n", a->command);
                        execl(a->command, a->command, NULL);
-       
-                       message(CONSOLE|LOG, "execl of %s failed: %s\n", 
-                               a->command, sys_errlist[errno]);
+
+                       message(CONSOLE | LOG, "\rexec of '%s' failed: %m\n",
+                                       a->command);
                        sync();
                        sleep(2);
                        init_reboot(RB_HALT_SYSTEM);
@@ -778,22 +787,20 @@ static void exec_signal(int sig)
 static void halt_signal(int sig)
 {
        shutdown_system();
-       message(CONSOLE|LOG,
+       message(CONSOLE | LOG,
 #if #cpu(s390)
                        /* Seems the s390 console is Wierd(tm). */
-                       "The system is halted. You may reboot now.\n"
+                       "\rThe system is halted. You may reboot now.\n"
 #else
-                       /* secondConsole is NULL for a serial console */
-                       "The system is halted. Press %s or turn off power\n",
-                       (secondConsole == NULL)? "Reset" : "CTRL-ALT-DEL"
+                       "\rThe system is halted. Press Reset or turn off power\n"
 #endif
-                  );
+               );
        sync();
 
        /* allow time for last message to reach serial console */
        sleep(2);
 
-       if (sig == SIGUSR2 && kernelVersion >= KERNEL_VERSION(2,2,0))
+       if (sig == SIGUSR2 && kernelVersion >= KERNEL_VERSION(2, 2, 0))
                init_reboot(RB_POWER_OFF);
        else
                init_reboot(RB_HALT_SYSTEM);
@@ -804,7 +811,7 @@ static void halt_signal(int sig)
 static void reboot_signal(int sig)
 {
        shutdown_system();
-       message(CONSOLE|LOG, "Please stand by while rebooting the system.\n");
+       message(CONSOLE | LOG, "\rPlease stand by while rebooting the system.\n");
        sync();
 
        /* allow time for last message to reach serial console */
@@ -826,12 +833,13 @@ static void stop_handler(int sig)
        int saved_errno = errno;
 
        got_cont = 0;
-       while(!got_cont) pause();
+       while (!got_cont)
+               pause();
        got_cont = 0;
        errno = saved_errno;
 }
 
-/* The SIGCONT handler */ 
+/* The SIGCONT handler */
 static void cont_handler(int sig)
 {
        got_cont = 1;
@@ -846,38 +854,34 @@ static void new_init_action(int action, char *command, char *cons)
        if (*cons == '\0')
                cons = console;
 
-       /* If BusyBox detects that a serial console is in use, then entries
-        * not refering to the console or null devices will _not_ be run.
-        * The exception to this rule is the null device.
-        */
-       if (secondConsole == NULL && strcmp(cons, console)
-               && strcmp(cons, "/dev/null"))
+       /* do not run entries if console device is not available */
+       if (access(cons, R_OK | W_OK))
                return;
        if (strcmp(cons, "/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\n");
+               message(LOG | CONSOLE, "\rMemory allocation failure\n");
                loop_forever();
        }
 
        /* Append to the end of the list */
-       for (a = init_action_list; a && a->next; a = a->next) ;
+       for (a = init_action_list; a && a->next; a = a->next);
        if (a) {
                a->next = new_action;
        } else {
                init_action_list = new_action;
        }
-       safe_strncpy(new_action->command, command, 255);
+       strcpy(new_action->command, command);
        new_action->action = action;
-       safe_strncpy(new_action->terminal, cons, 255);
+       strcpy(new_action->terminal, cons);
        new_action->pid = 0;
-//    message(LOG|CONSOLE, "command='%s' action='%d' terminal='%s'\n",
-//      new_action->command, new_action->action, new_action->terminal);
+/*    message(LOG|CONSOLE, "command='%s' action='%d' terminal='%s'\n",
+               new_action->command, new_action->action, new_action->terminal); */
 }
 
-static void delete_init_action(struct init_action * action)
+static void delete_init_action(struct init_action *action)
 {
        struct init_action *a, *b = NULL;
 
@@ -900,12 +904,13 @@ static void delete_init_action(struct init_action * action)
  * of "askfirst" shells).  If CONFIG_FEATURE_USE_INITTAB 
  * _is_ defined, but /etc/inittab is missing, this 
  * results in the same set of default behaviors.
- * */
+ */
 static void parse_inittab(void)
 {
 #ifdef CONFIG_FEATURE_USE_INITTAB
        FILE *file;
-       char buf[256], lineAsRead[256], tmpConsole[256];
+       char buf[INIT_BUFFS_SIZE], lineAsRead[INIT_BUFFS_SIZE],
+               tmpConsole[INIT_BUFFS_SIZE];
        char *id, *runlev, *action, *command, *eol;
        const struct init_action_type *a = actions;
        int foundIt;
@@ -925,17 +930,11 @@ static void parse_inittab(void)
 #endif
                /* Prepare to restart init when a HUP is received */
                new_init_action(RESTART, "/sbin/init", console);
-               /* Askfirst shell on tty1 */
+               /* Askfirst shell on tty1-4 */
                new_init_action(ASKFIRST, LOGIN_SHELL, console);
-               /* Askfirst shell on tty2 */
-               if (secondConsole != NULL)
-                       new_init_action(ASKFIRST, LOGIN_SHELL, secondConsole);
-               /* Askfirst shell on tty3 */
-               if (thirdConsole != NULL)
-                       new_init_action(ASKFIRST, LOGIN_SHELL, thirdConsole);
-               /* Askfirst shell on tty4 */
-               if (fourthConsole != NULL)
-                       new_init_action(ASKFIRST, LOGIN_SHELL, fourthConsole);
+               new_init_action(ASKFIRST, LOGIN_SHELL, VC_2);
+               new_init_action(ASKFIRST, LOGIN_SHELL, VC_3);
+               new_init_action(ASKFIRST, LOGIN_SHELL, VC_4);
                /* sysinit */
                new_init_action(SYSINIT, INIT_SCRIPT, console);
 
@@ -943,7 +942,7 @@ static void parse_inittab(void)
 #ifdef CONFIG_FEATURE_USE_INITTAB
        }
 
-       while (fgets(buf, 255, file) != NULL) {
+       while (fgets(buf, INIT_BUFFS_SIZE, file) != NULL) {
                foundIt = FALSE;
                /* Skip leading spaces */
                for (id = buf; *id == ' ' || *id == '\t'; id++);
@@ -963,7 +962,7 @@ static void parse_inittab(void)
                /* 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);
+                       message(LOG | CONSOLE, "\rBad inittab entry: %s\n", lineAsRead);
                        continue;
                } else {
                        *runlev = '\0';
@@ -973,7 +972,7 @@ static void parse_inittab(void)
                /* Separate the runlevels from the action */
                action = strchr(runlev, ':');
                if (action == NULL || *(action + 1) == '\0') {
-                       message(LOG | CONSOLE, "Bad inittab entry: %s\n", lineAsRead);
+                       message(LOG | CONSOLE, "\rBad inittab entry: %s\n", lineAsRead);
                        continue;
                } else {
                        *action = '\0';
@@ -983,7 +982,7 @@ static void parse_inittab(void)
                /* Separate the action from the command */
                command = strchr(action, ':');
                if (command == NULL || *(command + 1) == '\0') {
-                       message(LOG | CONSOLE, "Bad inittab entry: %s\n", lineAsRead);
+                       message(LOG | CONSOLE, "\rBad inittab entry: %s\n", lineAsRead);
                        continue;
                } else {
                        *command = '\0';
@@ -996,7 +995,7 @@ static void parse_inittab(void)
                        if (strcmp(a->name, action) == 0) {
                                if (*id != '\0') {
                                        strcpy(tmpConsole, "/dev/");
-                                       strncat(tmpConsole, id, 200);
+                                       strncat(tmpConsole, id, INIT_BUFFS_SIZE - 6);
                                        id = tmpConsole;
                                }
                                new_init_action(a->action, command, id);
@@ -1008,11 +1007,12 @@ static void parse_inittab(void)
                        continue;
                else {
                        /* Choke on an unknown action */
-                       message(LOG | CONSOLE, "Bad inittab entry: %s\n", lineAsRead);
+                       message(LOG | CONSOLE, "\rBad inittab entry: %s\n", lineAsRead);
                }
        }
+       fclose(file);
        return;
-#endif /* CONFIG_FEATURE_USE_INITTAB */
+#endif                                                 /* CONFIG_FEATURE_USE_INITTAB */
 }
 
 
@@ -1026,31 +1026,30 @@ extern int init_main(int argc, char **argv)
        if (argc > 1 && !strcmp(argv[1], "-q")) {
                /* don't assume init's pid == 1 */
                long *pid = find_pid_by_name("init");
-               if (!pid || *pid<=0) {
+
+               if (!pid || *pid <= 0) {
                        pid = find_pid_by_name("linuxrc");
-                       if (!pid || *pid<=0)
+                       if (!pid || *pid <= 0)
                                error_msg_and_die("no process killed");
                }
                kill(*pid, SIGHUP);
                exit(0);
        }
-
 #ifndef DEBUG_INIT
        /* Expect to be invoked as init with PID=1 or be invoked as linuxrc */
        if (getpid() != 1
 #ifdef CONFIG_FEATURE_INITRD
-                       && strstr(applet_name, "linuxrc") == NULL
+               && strstr(applet_name, "linuxrc") == NULL
 #endif
-                         )
-       {
-                       show_usage();
+               ) {
+               show_usage();
        }
        /* Set up sig handlers  -- be sure to
         * clear all of these in run() */
-       signal(SIGHUP,  exec_signal);
+       signal(SIGHUP, exec_signal);
        signal(SIGUSR1, halt_signal);
        signal(SIGUSR2, halt_signal);
-       signal(SIGINT,  ctrlaltdel_signal);
+       signal(SIGINT, ctrlaltdel_signal);
        signal(SIGTERM, reboot_signal);
        signal(SIGCONT, cont_handler);
        signal(SIGSTOP, stop_handler);
@@ -1064,23 +1063,27 @@ extern int init_main(int argc, char **argv)
        /* Figure out what kernel this is running */
        kernelVersion = get_kernel_revision();
 
+       /* 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);
 
-       /* Figure out where the default console should be */
-       console_init();
+       if (device_open(console, O_RDWR | O_NOCTTY) == 0) {
+               set_term(0);
+               close(0);
+       }
 
-       set_term(0);
        chdir("/");
        setsid();
 
        /* Make sure PATH is set to something sane */
-       putenv("PATH="_PATH_STDPATH);
+       putenv("PATH=" _PATH_STDPATH);
 
        /* Hello world */
-       message(MAYBE_CONSOLE|LOG, "init started:  %s\n", full_version);
+       message(MAYBE_CONSOLE | LOG, "\rinit started:  %s\n", full_version);
 
        /* Make sure there is enough memory to do something useful. */
        check_memory();
@@ -1089,12 +1092,9 @@ extern int init_main(int argc, char **argv)
        if (argc > 1 && (!strcmp(argv[1], "single") ||
                                         !strcmp(argv[1], "-s") || !strcmp(argv[1], "1"))) {
                /* Ask first then start a shell on tty2-4 */
-               if (secondConsole != NULL)
-                       new_init_action(ASKFIRST, LOGIN_SHELL, secondConsole);
-               if (thirdConsole != NULL)
-                       new_init_action(ASKFIRST, LOGIN_SHELL, thirdConsole);
-               if (fourthConsole != NULL)
-                       new_init_action(ASKFIRST, LOGIN_SHELL, fourthConsole);
+               new_init_action(ASKFIRST, LOGIN_SHELL, VC_2);
+               new_init_action(ASKFIRST, LOGIN_SHELL, VC_3);
+               new_init_action(ASKFIRST, LOGIN_SHELL, VC_4);
                /* Start a shell on tty1 */
                new_init_action(RESPAWN, LOGIN_SHELL, console);
        } else {
@@ -1123,7 +1123,8 @@ extern int init_main(int argc, char **argv)
 
        /* If there is nothing else to do, stop */
        if (init_action_list == NULL) {
-               message(LOG | CONSOLE, "No more tasks for init -- sleeping forever.\n");
+               message(LOG | CONSOLE,
+                               "\rNo more tasks for init -- sleeping forever.\n");
                loop_forever();
        }