Apply patch from Felipe Kellermann to simlify logic of sort functions.
[oweals/busybox.git] / init / init.c
index 989babff7f0d69766040670cdadda8dc3f616eac..2278e521f81b5b5d46dc0c48e3b2fe2a95b4fe6b 100644 (file)
@@ -3,7 +3,7 @@
  * 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>
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  * Adjusted by so many folks, it's impossible to keep track.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,7 +22,7 @@
  *
  */
 
-/* Turn this on to disable all the dangerous 
+/* Turn this on to disable all the dangerous
    rebooting stuff when debugging.
 #define DEBUG_INIT
 */
 #include <sys/mount.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
 
-#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_MMU__)
-#define fork   vfork
-#endif
 
 #define INIT_BUFFS_SIZE 256
 
@@ -63,37 +65,35 @@ 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;
+       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];
 };
 
 
-#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)
-#endif
-
 #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 
+ * When a file named CORE_ENABLE_FLAG_FILE exists, setrlimit is called
  * before processes are spawned to set core file size as unlimited.
  * This is for debugging only.  Don't use this is production, unless
  * you want core dumps lying about....
@@ -105,14 +105,6 @@ struct serial_struct {
 
 #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
 
-#if __GNU_LIBRARY__ > 5
-#include <sys/kdaemon.h>
-#else
-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 */
 #ifndef INIT_SCRIPT
 #define INIT_SCRIPT  "/etc/init.d/rcS" /* Default sysinit script. */
@@ -120,6 +112,8 @@ extern int bdflush(int func, long int data);
 
 #define MAXENV 16              /* Number of env. vars */
 
+#define CONSOLE_BUFF_SIZE 32
+
 /* Allowed init action types */
 #define SYSINIT     0x001
 #define RESPAWN     0x002
@@ -152,16 +146,14 @@ static const struct init_action_type actions[] = {
 struct init_action {
        pid_t pid;
        char command[INIT_BUFFS_SIZE];
-       char terminal[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 int kernelVersion = 0;
-static char termType[32] = "TERM=linux";
-static char console[32] = _PATH_CONSOLE;
+static char console[CONSOLE_BUFF_SIZE] = _PATH_CONSOLE;
 
 #ifndef CONFIG_SYSLOGD
 static char *log = VC_5;
@@ -184,9 +176,18 @@ static const int RB_DISABLE_CAD = 0;
 static const int RB_AUTOBOOT = 0x01234567;
 #endif
 
+static const char * const environment[] = {
+       "HOME=/",
+       "PATH=" _PATH_STDPATH,
+       "SHELL=/bin/sh",
+       "USER=root",
+       NULL
+};
+
 /* Function prototypes */
 static void delete_init_action(struct init_action *a);
-static int waitfor(struct init_action *a);
+static int waitfor(const struct init_action *a);
+static void halt_signal(int sig);
 
 
 static void loop_forever(void)
@@ -197,64 +198,75 @@ static void loop_forever(void)
 
 /* 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, ...)
+#ifndef DEBUG_INIT
+static inline void messageD(int device, const char *fmt, ...)
 {
 }
 #else
-#define messageND message
+#define messageD message
 #endif
-static void message(int device, char *fmt, ...)
+static void message(int device, const char *fmt, ...)
        __attribute__ ((format(printf, 2, 3)));
-static void message(int device, char *fmt, ...)
+static void message(int device, const char *fmt, ...)
 {
        va_list arguments;
-       int fd;
+       int l;
+       char msg[1024];
+#ifndef CONFIG_SYSLOGD
+       static int log_fd = -1;
+#endif
 
-#ifdef CONFIG_SYSLOGD
+       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) {
-               char msg[1024];
-
-               va_start(arguments, fmt);
-               vsnprintf(msg, sizeof(msg), fmt, arguments);
-               va_end(arguments);
-               syslog_msg(LOG_USER, LOG_INFO, msg);
+               /* don`t out "\r\n" */
+               openlog(bb_applet_name, 0, LOG_DAEMON);
+               syslog(LOG_INFO, "%s", msg);
+               closelog();
        }
+
+       msg[l++] = '\n';
+       msg[l] = 0;
 #else
-       static int log_fd = -1;
 
+       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, O_RDWR | O_NDELAY)) < 0) {
+               if ((log_fd = device_open(log, O_RDWR | O_NDELAY | O_NOCTTY)) < 0) {
                        log_fd = -2;
-                       fprintf(stderr, "Bummer, can't write to log on %s!\n", log);
+                       bb_error_msg("Bummer, can't write to log on %s!", log);
                        device = CONSOLE;
+               } else {
+                       fcntl(log_fd, F_SETFD, FD_CLOEXEC);
                }
        }
        if ((device & LOG) && (log_fd >= 0)) {
-               va_start(arguments, fmt);
-               vdprintf(log_fd, fmt, arguments);
-               va_end(arguments);
+               bb_full_write(log_fd, msg, l);
        }
 #endif
 
        if (device & CONSOLE) {
+               int fd = device_open(_PATH_CONSOLE,
+                                       O_WRONLY | O_NOCTTY | O_NDELAY);
                /* 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) {
-                       va_start(arguments, fmt);
-                       vdprintf(fd, fmt, arguments);
-                       va_end(arguments);
+               if (fd >= 0) {
+                       bb_full_write(fd, msg, l);
                        close(fd);
+#ifdef DEBUG_INIT
+               /* all descriptors may be closed */
                } else {
-                       fprintf(stderr, "Bummer, can't print: ");
+                       bb_error_msg("Bummer, can't print: ");
                        va_start(arguments, fmt);
                        vfprintf(stderr, fmt, arguments);
                        va_end(arguments);
+#endif
                }
        }
 }
@@ -299,13 +311,13 @@ static void set_term(int fd)
 
 /* How much memory does this machine have?
    Units are kBytes to avoid overflow on 4GB machines */
-static int check_free_memory(void)
+static unsigned int check_free_memory(void)
 {
        struct sysinfo info;
        unsigned int result, u, s = 10;
 
        if (sysinfo(&info) != 0) {
-               perror_msg("Error checking free memory");
+               bb_perror_msg("Error checking free memory");
                return -1;
        }
 
@@ -319,40 +331,33 @@ static int check_free_memory(void)
                s--;
        }
        result = (info.totalram >> s) + (info.totalswap >> s);
-       result = result * u;
-       if (result < 0)
-               result = INT_MAX;
-       return result;
+       if (((unsigned long long)result * (unsigned long long)u) > UINT_MAX) {
+               return(UINT_MAX);
+       } else {
+               return(result * u);
+       }
 }
 
 static void console_init(void)
 {
        int fd;
-       int tried_devcons = 0;
-       int tried_vtprimary = 0;
+       int tried = 0;
        struct vt_stat vt;
        struct serial_struct sr;
        char *s;
 
-       if ((s = getenv("TERM")) != NULL) {
-               snprintf(termType, sizeof(termType) - 1, "TERM=%s", s);
-       }
-
-       if ((s = getenv("CONSOLE")) != NULL) {
+       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 
+       /* sparc kernel supports console=tty[ab] parameter which is also
         * passed to init, so catch it here */
-       else if ((s = getenv("console")) != NULL) {
                /* 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 {
+       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 */
@@ -362,39 +367,41 @@ static void console_init(void)
                        snprintf(console, sizeof(console) - 1, VC_FORMAT, vt.v_active);
                } else {
                        safe_strncpy(console, _PATH_CONSOLE, sizeof(console));
-                       tried_devcons++;
+                       tried++;
                }
        }
 
-       while ((fd = open(console, O_RDONLY | O_NONBLOCK)) < 0) {
-               /* Can't open selected console -- try /dev/console */
-               if (!tried_devcons) {
-                       tried_devcons++;
-                       safe_strncpy(console, _PATH_CONSOLE, sizeof(console));
-                       continue;
-               }
-               /* Can't open selected console -- try vt1 */
-               if (!tried_vtprimary) {
-                       tried_vtprimary++;
-                       safe_strncpy(console, VC_1, sizeof(console));
-                       continue;
-               }
-               break;
+       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 =
+#endif
                safe_strncpy(console, "/dev/null", sizeof(console));
        } else {
+               s = getenv("TERM");
                /* check for serial console */
-               if (ioctl(0, TIOCGSERIAL, &sr) == 0) {
+               if (ioctl(fd, TIOCGSERIAL, &sr) == 0) {
                        /* Force the TERM setting to vt102 for serial console --
                         * if TERM is set to linux (the default) */
-                       if (strcmp(termType, "TERM=linux") == 0)
-                               safe_strncpy(termType, "TERM=vt102", sizeof(termType));
+                       if (s == NULL || strcmp(s, "linux") == 0)
+                               putenv("TERM=vt102");
+#ifndef CONFIG_SYSLOGD
+                       log = console;
+#endif
+               } else {
+                       if (s == NULL)
+                               putenv("TERM=linux");
                }
                close(fd);
        }
-       message(LOG, "console=%s\n", console);
+       messageD(LOG, "console=%s", console);
 }
 
 static void fixup_argv(int argc, char **argv, char *new_argv0)
@@ -414,68 +421,20 @@ static void fixup_argv(int argc, char **argv, char *new_argv0)
        }
 }
 
-/* Make sure there is enough memory to do something useful. *
- * Calls "swapon -a" if needed so be sure /etc/fstab is present... */
-static void check_memory(void)
-{
-       struct stat statBuf;
-
-       if (check_free_memory() > 1000)
-               return;
-
-#if !defined(__UCLIBC__) || defined(__UCLIBC_HAS_MMU__)
-       if (stat("/etc/fstab", &statBuf) == 0) {
-               /* swapon -a requires /proc typically */
-               system("/bin/mount -t proc proc /proc");
-               /* Try to turn on swap */
-               system("/sbin/swapon -a");
-               if (check_free_memory() < 1000)
-                       goto goodnight;
-       } else
-               goto goodnight;
-       return;
-#endif
-
-  goodnight:
-       message(CONSOLE, "\rSorry, your computer does not have enough memory.\n");
-       loop_forever();
-}
-
-static pid_t run(struct init_action *a)
+static pid_t run(const struct init_action *a)
 {
        struct stat sb;
-       int i, j, junk;
+       int i, junk;
        pid_t pid, pgrp, tmp_pid;
        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] = {
-               termType,
-               "HOME=/",
-               "PATH=" _PATH_STDPATH,
-               "SHELL=" SHELL,
-               "USER=root",
-               NULL
-       };
        static const char press_enter[] =
 #ifdef CUSTOMIZED_BANNER
 #include CUSTOMIZED_BANNER
 #endif
                "\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++) {
-                       s = strchr(environment[j], '=');
-                       if (!strncmp(environ[i], environment[j], s - environment[j]))
-                               break;
-               }
-               if (!environment[j]) {
-                       environment[j++] = environ[i];
-                       environment[j] = NULL;
-               }
-       }
-
        /* Block sigchild while forking.  */
        sigemptyset(&nmask);
        sigaddset(&nmask, SIGCHLD);
@@ -499,25 +458,20 @@ static pid_t run(struct init_action *a)
                signal(SIGTSTP, SIG_DFL);
 
                /* Create a new session and make ourself the process
-                * group leader for non-interactive jobs */
-               if ((a->action & (RESPAWN)) == 0)
-                       setsid();
+                * group leader */
+               setsid();
 
                /* Open the new terminal device */
-               if ((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, "\rdevice '%s' does not exist.\n",
+                               message(LOG | CONSOLE, "device '%s' does not exist.",
                                                a->terminal);
                                _exit(1);
                        }
-                       message(LOG | CONSOLE, "\rBummer, can't open %s\n", a->terminal);
+                       message(LOG | CONSOLE, "Bummer, can't open %s", a->terminal);
                        _exit(1);
                }
 
-               /* Non-interactive jobs should not get a controling tty */
-               if ((a->action & (RESPAWN)) == 0)
-                       (void) ioctl(0, TIOCSCTTY, 0);
-
                /* Make sure the terminal will act fairly normal for us */
                set_term(0);
                /* Setup stdout, stderr for the new process so
@@ -525,18 +479,13 @@ static pid_t run(struct init_action *a)
                dup(0);
                dup(0);
 
-               /* For interactive jobs, create a new session 
-                * and become the process group leader */
-               if ((a->action & (RESPAWN)))
-                       setsid();
-
                /* 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 */
                        if ((pid = fork()) < 0) {
-                               message(LOG | CONSOLE, "Can't fork!\n");
+                               message(LOG | CONSOLE, "Can't fork!");
                                _exit(1);
                        }
 
@@ -549,7 +498,12 @@ 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);
+                               while ((tmp_pid = waitpid(pid, &junk, 0)) != pid) {
+                                       if (tmp_pid == -1 && errno == ECHILD) {
+                                               break;
+                                       }
+                                       /* FIXME handle other errors */
+                }
 
                                /* See if stealing the controlling tty back is necessary */
                                pgrp = tcgetpgrp(0);
@@ -558,7 +512,7 @@ static pid_t run(struct init_action *a)
 
                                /* Use a temporary process to steal the controlling tty. */
                                if ((pid = fork()) < 0) {
-                                       message(LOG | CONSOLE, "\rCan't fork!\n");
+                                       message(LOG | CONSOLE, "Can't fork!");
                                        _exit(1);
                                }
                                if (pid == 0) {
@@ -578,10 +532,9 @@ static pid_t run(struct init_action *a)
 
                /* See if any special /bin/sh requiring characters are present */
                if (strpbrk(a->command, "~`!$^&*()=|\\{}[];\"'<>?") != NULL) {
-                       cmd[0] = SHELL;
+                       cmd[0] = (char *)DEFAULT_SHELL;
                        cmd[1] = "-c";
-                       strcat(strcpy(buf, "exec "), a->command);
-                       cmd[2] = buf;
+                       cmd[2] = strcat(strcpy(buf, "exec "), a->command);
                        cmd[3] = NULL;
                } else {
                        /* Convert command (char*) into cmd (char**, one word per string) */
@@ -600,8 +553,8 @@ static pid_t run(struct init_action *a)
 
                /*
                   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 
+                  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").
                 */
 
@@ -611,11 +564,11 @@ static pid_t run(struct init_action *a)
                        ++cmdpath;
 
                        /* find the last component in the command pathname */
-                       s = get_last_path_component(cmdpath);
+                       s = bb_get_last_path_component(cmdpath);
 
                        /* make a new argv[0] */
                        if ((cmd[0] = malloc(strlen(s) + 2)) == NULL) {
-                               message(LOG | CONSOLE, "malloc failed");
+                               message(LOG | CONSOLE, bb_msg_memory_exhausted);
                                cmd[0] = cmdpath;
                        } else {
                                cmd[0][0] = '-';
@@ -623,24 +576,28 @@ static pid_t run(struct init_action *a)
                        }
                }
 
+#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 
+                        * 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",
+                       messageD(LOG, "Waiting for enter to start '%s'"
+                                               "(pid %d, terminal %s)\n",
                                          cmdpath, getpid(), a->terminal);
-                       write(fileno(stdout), press_enter, sizeof(press_enter) - 1);
-                       getc(stdin);
+                       bb_full_write(1, press_enter, sizeof(press_enter) - 1);
+                       while(read(0, &c, 1) == 1 && c != '\n')
+                               ;
                }
+#endif
 
                /* Log the process name and args */
-               messageND(LOG, "Starting pid %d, console %s: '%s'\n",
+               message(LOG, "Starting pid %d, console %s: '%s'",
                                  getpid(), a->terminal, cmdpath);
 
 #if defined CONFIG_FEATURE_INIT_COREDUMPS
@@ -653,32 +610,34 @@ static pid_t run(struct init_action *a)
                }
 #endif
 
-               /* Now run it.  The new program will take over this PID, 
+               /* Now run it.  The new program will take over this PID,
                 * so nothing further in init.c should be run. */
-               execve(cmdpath, cmd, environment);
+               execv(cmdpath, cmd);
 
                /* We're still here?  Some error happened. */
-               message(LOG | CONSOLE, "\rBummer, could not run '%s': %s\n", cmdpath,
-                               strerror(errno));
+               message(LOG | CONSOLE, "Bummer, could not run '%s': %m", cmdpath);
                _exit(-1);
        }
        sigprocmask(SIG_SETMASK, &omask, NULL);
        return pid;
 }
 
-static int waitfor(struct init_action *a)
+static int waitfor(const struct init_action *a)
 {
        int pid;
        int status, wpid;
 
        pid = run(a);
        while (1) {
-               wpid = wait(&status);
-               if (wpid > 0 && wpid != pid) {
-                       continue;
-               }
+               wpid = waitpid(pid,&status,0);
                if (wpid == pid)
                        break;
+               if (wpid == -1 && errno == ECHILD) {
+                       /* we missed its termination */
+                       break;
+               }
+               /* FIXME other errors should maybe trigger an error, but allow
+                * the program to continue */
        }
        return wpid;
 }
@@ -691,8 +650,7 @@ 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) {
@@ -709,8 +667,20 @@ 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) {
+               reboot(magic);
+               _exit(0);
+       }
+       waitpid (pid, NULL, 0);
+}
+
 static void shutdown_system(void)
 {
        sigset_t block_signals;
@@ -736,25 +706,20 @@ static void shutdown_system(void)
        /* Allow Ctrl-Alt-Del to reboot system. */
        init_reboot(RB_ENABLE_CAD);
 
-       message(CONSOLE | LOG, "\n\rThe system is going down NOW !!\n");
+       message(CONSOLE | LOG, "The system is going down NOW !!");
        sync();
 
        /* Send signals to every process _except_ pid 1 */
-       message(CONSOLE | LOG, "\rSending SIGTERM to all processes.\n");
+       message(CONSOLE | LOG, "Sending SIGTERM to all processes.");
        kill(-1, SIGTERM);
        sleep(1);
        sync();
 
-       message(CONSOLE | LOG, "\rSending SIGKILL to all processes.\n");
+       message(CONSOLE | LOG, "Sending SIGKILL to all processes.");
        kill(-1, SIGKILL);
        sleep(1);
 
        sync();
-       if (kernelVersion > 0 && kernelVersion <= KERNEL_VERSION(2, 2, 11)) {
-               /* bdflush, kupdate not needed for kernels >2.2.11 */
-               bdflush(1, 0);
-               sync();
-       }
 }
 
 static void exec_signal(int sig)
@@ -765,6 +730,8 @@ static void exec_signal(int sig)
        for (a = init_action_list; a; a = tmp) {
                tmp = a->next;
                if (a->action & RESTART) {
+                       struct stat sb;
+
                        shutdown_system();
 
                        /* unblock all signals, blocked in shutdown_system() */
@@ -780,11 +747,32 @@ static void exec_signal(int sig)
                        sigaddset(&unblock_signals, SIGTSTP);
                        sigprocmask(SIG_UNBLOCK, &unblock_signals, NULL);
 
-                       message(CONSOLE | LOG, "\rTrying to re-exec %s\n", a->command);
+                       /* Close whatever files are open. */
+                       close(0);
+                       close(1);
+                       close(2);
+
+                       /* Open the new terminal device */
+                       if ((device_open(a->terminal, O_RDWR)) < 0) {
+                               if (stat(a->terminal, &sb) != 0) {
+                                       message(LOG | CONSOLE, "device '%s' does not exist.", a->terminal);
+                               } else {
+                                       message(LOG | CONSOLE, "Bummer, can't open %s", a->terminal);
+                               }
+                               halt_signal(SIGUSR1);
+                       }
+
+                       /* Make sure the terminal will act fairly normal for us */
+                       set_term(0);
+                       /* Setup stdout, stderr on the supplied terminal */
+                       dup(0);
+                       dup(0);
+
+                       messageD(CONSOLE | LOG, "Trying to re-exec %s", a->command);
                        execl(a->command, a->command, NULL);
 
-                       message(CONSOLE | LOG, "\rexec of '%s' failed: %s\n",
-                                       a->command, strerror(errno));
+                       message(CONSOLE | LOG, "exec of '%s' failed: %m",
+                                       a->command);
                        sync();
                        sleep(2);
                        init_reboot(RB_HALT_SYSTEM);
@@ -799,9 +787,9 @@ static void halt_signal(int sig)
        message(CONSOLE | LOG,
 #if #cpu(s390)
                        /* Seems the s390 console is Wierd(tm). */
-                       "\rThe system is halted. You may reboot now.\n"
+                       "The system is halted. You may reboot now."
 #else
-                       "\rThe system is halted. Press Reset or turn off power\n"
+                       "The system is halted. Press Reset or turn off power"
 #endif
                );
        sync();
@@ -809,7 +797,7 @@ static void halt_signal(int sig)
        /* allow time for last message to reach serial console */
        sleep(2);
 
-       if (sig == SIGUSR2 && kernelVersion >= KERNEL_VERSION(2, 2, 0))
+       if (sig == SIGUSR2)
                init_reboot(RB_POWER_OFF);
        else
                init_reboot(RB_HALT_SYSTEM);
@@ -820,7 +808,7 @@ static void halt_signal(int sig)
 static void reboot_signal(int sig)
 {
        shutdown_system();
-       message(CONSOLE | LOG, "\rPlease stand by while rebooting the system.\n");
+       message(CONSOLE | LOG, "Please stand by while rebooting the system.");
        sync();
 
        /* allow time for last message to reach serial console */
@@ -856,7 +844,7 @@ static void cont_handler(int sig)
 
 #endif                                                 /* ! DEBUG_INIT */
 
-static void new_init_action(int action, char *command, char *cons)
+static void new_init_action(int action, const char *command, const char *cons)
 {
        struct init_action *new_action, *a;
 
@@ -871,12 +859,19 @@ static void new_init_action(int action, char *command, char *cons)
 
        new_action = calloc((size_t) (1), sizeof(struct init_action));
        if (!new_action) {
-               message(LOG | CONSOLE, "\rMemory allocation failure\n");
+               message(LOG | CONSOLE, "Memory allocation failure");
                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) {
+               /* don't enter action if it's already in the list */
+               if ((strcmp(a->command, command) == 0) &&
+                   (strcmp(a->terminal, cons) ==0)) {
+                       free(new_action);
+                       return;
+               }
+       }
        if (a) {
                a->next = new_action;
        } else {
@@ -885,9 +880,11 @@ static void new_init_action(int action, char *command, 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;
-/*    message(LOG|CONSOLE, "command='%s' action='%d' terminal='%s'\n",
-               new_action->command, new_action->action, new_action->terminal); */
+#endif
+       messageD(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)
@@ -907,22 +904,49 @@ static void delete_init_action(struct init_action *action)
        }
 }
 
+/* Make sure there is enough memory to do something useful. *
+ * Calls "swapon -a" if needed so be sure /etc/fstab is present... */
+static void check_memory(void)
+{
+       struct stat statBuf;
+
+       if (check_free_memory() > 1000)
+               return;
+
+#if !defined(__UCLIBC__) || defined(__ARCH_HAS_MMU__)
+       if (stat("/etc/fstab", &statBuf) == 0) {
+               /* swapon -a requires /proc typically */
+               new_init_action(SYSINIT, "/bin/mount -t proc proc /proc", "");
+               /* Try to turn on swap */
+               new_init_action(SYSINIT, "/sbin/swapon -a", "");
+               run_actions(SYSINIT);   /* wait and removing */
+               if (check_free_memory() < 1000)
+                       goto goodnight;
+       } else
+               goto goodnight;
+       return;
+#endif
+
+  goodnight:
+       message(CONSOLE, "Sorry, your computer does not have enough memory.");
+       loop_forever();
+}
+
 /* NOTE that if CONFIG_FEATURE_USE_INITTAB is NOT defined,
  * then parse_inittab() simply adds in some default
- * actions(i.e., runs INIT_SCRIPT and then starts a pair 
- * of "askfirst" shells).  If CONFIG_FEATURE_USE_INITTAB 
- * _is_ defined, but /etc/inittab is missing, this 
+ * actions(i.e., runs INIT_SCRIPT and then starts a pair
+ * 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[INIT_BUFFS_SIZE], lineAsRead[INIT_BUFFS_SIZE],
-               tmpConsole[INIT_BUFFS_SIZE];
+       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;
-       int foundIt;
 
 
        file = fopen(INITTAB, "r");
@@ -930,29 +954,28 @@ static void parse_inittab(void)
                /* No inittab file -- set up some default behavior */
 #endif
                /* Reboot on Ctrl-Alt-Del */
-               new_init_action(CTRLALTDEL, "/sbin/reboot", console);
+               new_init_action(CTRLALTDEL, "/sbin/reboot", "");
                /* Umount all filesystems on halt/reboot */
-               new_init_action(SHUTDOWN, "/bin/umount -a -r", console);
-#if !defined(__UCLIBC__) || defined(__UCLIBC_HAS_MMU__)
+               new_init_action(SHUTDOWN, "/bin/umount -a -r", "");
+#if !defined(__UCLIBC__) || defined(__ARCH_HAS_MMU__)
                /* Swapoff on halt/reboot */
-               new_init_action(SHUTDOWN, "/sbin/swapoff -a", console);
+               new_init_action(SHUTDOWN, "/sbin/swapoff -a", "");
 #endif
                /* Prepare to restart init when a HUP is received */
-               new_init_action(RESTART, "/sbin/init", console);
+               new_init_action(RESTART, "/sbin/init", "");
                /* Askfirst shell on tty1-4 */
-               new_init_action(ASKFIRST, LOGIN_SHELL, console);
-               new_init_action(ASKFIRST, LOGIN_SHELL, VC_2);
-               new_init_action(ASKFIRST, LOGIN_SHELL, VC_3);
-               new_init_action(ASKFIRST, LOGIN_SHELL, VC_4);
+               new_init_action(ASKFIRST, bb_default_login_shell, "");
+               new_init_action(ASKFIRST, bb_default_login_shell, VC_2);
+               new_init_action(ASKFIRST, bb_default_login_shell, VC_3);
+               new_init_action(ASKFIRST, bb_default_login_shell, VC_4);
                /* sysinit */
-               new_init_action(SYSINIT, INIT_SCRIPT, console);
+               new_init_action(SYSINIT, INIT_SCRIPT, "");
 
                return;
 #ifdef CONFIG_FEATURE_USE_INITTAB
        }
 
        while (fgets(buf, INIT_BUFFS_SIZE, file) != NULL) {
-               foundIt = FALSE;
                /* Skip leading spaces */
                for (id = buf; *id == ' ' || *id == '\t'; id++);
 
@@ -971,7 +994,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, "\rBad inittab entry: %s\n", lineAsRead);
+                       message(LOG | CONSOLE, "Bad inittab entry: %s", lineAsRead);
                        continue;
                } else {
                        *runlev = '\0';
@@ -981,7 +1004,7 @@ static void parse_inittab(void)
                /* Separate the runlevels from the action */
                action = strchr(runlev, ':');
                if (action == NULL || *(action + 1) == '\0') {
-                       message(LOG | CONSOLE, "\rBad inittab entry: %s\n", lineAsRead);
+                       message(LOG | CONSOLE, "Bad inittab entry: %s", lineAsRead);
                        continue;
                } else {
                        *action = '\0';
@@ -991,7 +1014,7 @@ static void parse_inittab(void)
                /* Separate the action from the command */
                command = strchr(action, ':');
                if (command == NULL || *(command + 1) == '\0') {
-                       message(LOG | CONSOLE, "\rBad inittab entry: %s\n", lineAsRead);
+                       message(LOG | CONSOLE, "Bad inittab entry: %s", lineAsRead);
                        continue;
                } else {
                        *command = '\0';
@@ -999,24 +1022,23 @@ static void parse_inittab(void)
                }
 
                /* Ok, now process it */
-               a = actions;
-               while (a->name != 0) {
+               for (a = actions; a->name != 0; a++) {
                        if (strcmp(a->name, action) == 0) {
                                if (*id != '\0') {
+                                       if(strncmp(id, "/dev/", 5) == 0)
+                                               id += 5;
                                        strcpy(tmpConsole, "/dev/");
-                                       strncat(tmpConsole, id, INIT_BUFFS_SIZE - 6);
+                                       safe_strncpy(tmpConsole + 5, id,
+                                               CONSOLE_BUFF_SIZE - 5);
                                        id = tmpConsole;
                                }
                                new_init_action(a->action, command, id);
-                               foundIt = TRUE;
+                               break;
                        }
-                       a++;
                }
-               if (foundIt == TRUE)
-                       continue;
-               else {
+               if (a->name == 0) {
                        /* Choke on an unknown action */
-                       message(LOG | CONSOLE, "\rBad inittab entry: %s\n", lineAsRead);
+                       message(LOG | CONSOLE, "Bad inittab entry: %s", lineAsRead);
                }
        }
        fclose(file);
@@ -1024,8 +1046,14 @@ static void parse_inittab(void)
 #endif                                                 /* CONFIG_FEATURE_USE_INITTAB */
 }
 
-
-
+static void reload_signal(int sig)
+{
+        message(LOG, "Reloading /etc/inittab");
+        parse_inittab();
+       run_actions(RESPAWN);
+        return;
+}
+                                                            
 extern int init_main(int argc, char **argv)
 {
        struct init_action *a;
@@ -1033,25 +1061,16 @@ extern int init_main(int argc, char **argv)
        int status;
 
        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) {
-                       pid = find_pid_by_name("linuxrc");
-                       if (!pid || *pid <= 0)
-                               error_msg_and_die("no process killed");
-               }
-               kill(*pid, SIGHUP);
-               exit(0);
+               return kill_init(SIGHUP);
        }
 #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(bb_applet_name, "linuxrc") == NULL
 #endif
                ) {
-               show_usage();
+               bb_show_usage();
        }
        /* Set up sig handlers  -- be sure to
         * clear all of these in run() */
@@ -1064,14 +1083,11 @@ extern int init_main(int argc, char **argv)
        signal(SIGSTOP, stop_handler);
        signal(SIGTSTP, stop_handler);
 
-       /* Turn off rebooting via CTL-ALT-DEL -- we get a 
+       /* 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 what kernel this is running */
-       kernelVersion = get_kernel_revision();
-
        /* Figure out where the default console should be */
        console_init();
 
@@ -1087,12 +1103,14 @@ extern int init_main(int argc, char **argv)
 
        chdir("/");
        setsid();
-
-       /* Make sure PATH is set to something sane */
-       putenv("PATH=" _PATH_STDPATH);
-
+       {
+               const char * const *e;
+               /* Make sure environs is set to something sane */
+               for(e = environment; *e; e++)
+                       putenv((char *) *e);
+       }
        /* Hello world */
-       message(MAYBE_CONSOLE | LOG, "\rinit started:  %s\n", full_version);
+       message(MAYBE_CONSOLE | LOG, "init started:  %s", bb_msg_full_version);
 
        /* Make sure there is enough memory to do something useful. */
        check_memory();
@@ -1100,18 +1118,14 @@ 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-4 */
-               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);
+               /* Start a shell on console */
+               new_init_action(RESPAWN, bb_default_login_shell, "");
        } else {
                /* Not in single user mode -- see what inittab says */
 
                /* NOTE that if CONFIG_FEATURE_USE_INITTAB is NOT defined,
                 * then parse_inittab() simply adds in some default
-                * actions(i.e., runs INIT_SCRIPT and then starts a pair 
+                * actions(i.e., runs INIT_SCRIPT and then starts a pair
                 * of "askfirst" shells */
                parse_inittab();
        }
@@ -1130,12 +1144,8 @@ extern int init_main(int argc, char **argv)
        /* Next run anything to be run only once */
        run_actions(ONCE);
 
-       /* If there is nothing else to do, stop */
-       if (init_action_list == NULL) {
-               message(LOG | CONSOLE,
-                               "\rNo more tasks for init -- sleeping forever.\n");
-               loop_forever();
-       }
+       /* Redefine SIGHUP to reread /etc/inittab */
+       signal(SIGHUP, reload_signal);
 
        /* Now run the looping stuff for the rest of forever */
        while (1) {
@@ -1150,7 +1160,7 @@ extern int init_main(int argc, char **argv)
 
                /* Wait for a child process to exit */
                wpid = wait(&status);
-               if (wpid > 0) {
+               while (wpid > 0) {
                        /* Find out who died and clean up their corpse */
                        for (a = init_action_list; a; a = a->next) {
                                if (a->pid == wpid) {
@@ -1158,9 +1168,12 @@ extern int init_main(int argc, char **argv)
                                         * restarted by run_actions() */
                                        a->pid = 0;
                                        message(LOG, "Process '%s' (pid %d) exited.  "
-                                                       "Scheduling it for restart.\n", a->command, wpid);
+                                                       "Scheduling it for restart.",
+                                                       a->command, wpid);
                                }
                        }
+                       /* see if anyone else is waiting to be reaped */
+                       wpid = waitpid (-1, &status, WNOHANG);
                }
        }
 }