Added support for ignoring '-g' per GNU ls, thanks to David Vrabel

[oweals/busybox.git] / init.c

diff --git a/init.c b/init.c
index 29d8f48f982e44b315eb8ac563ed0c530bdae887..2c275139122f8fda04033f8bba067e4655ac3922 100644 (file)
--- a/init.c
+++ b/init.c
@@ -42,11 +42,9 @@
 #include <linux/version.h>
 #include <linux/reboot.h>
 #include <linux/unistd.h>
-#include <sys/sysinfo.h>               /* For check_free_memory() */
 #include <sys/fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/mount.h>
-#include <sys/sysmacros.h>
 #include <sys/types.h>
 #include <sys/vt.h>                            /* for vt_stat */
 #include <sys/wait.h>
@@ -93,7 +91,7 @@
 #if defined(__GLIBC__)
 #include <sys/kdaemon.h>
 #else
-_syscall2(int, bdflush, int, func, int, data);
+static _syscall2(int, bdflush, int, func, int, data);
 #endif                                                 /* __GLIBC__ */
 
 
@@ -270,13 +268,28 @@ static int check_free_memory()
 {
        struct sysinfo info;
 
+       /* Pre initialize mem_unit in case this kernel is something prior to
+        * the linux 2.4 kernel (which will actually fill in mem_unit... */
        sysinfo(&info);
        if (sysinfo(&info) != 0) {
-               message(LOG, "Error checking free memory: %s\n", strerror(errno));
+               printf("Error checking free memory: %s\n", strerror(errno));
                return -1;
        }
+       if (info.mem_unit==0) {
+               /* Looks like we have a kernel prior to Linux 2.4.x */
+               info.mem_unit=1024;
+               info.totalram/=info.mem_unit;
+               info.totalswap/=info.mem_unit;
+       } else {
+               /* Bah. Linux 2.4.x completely changed sysinfo. This can in theory
+               overflow a 32 bit unsigned long, but who puts more then 4GiB ram+swap
+               on an embedded system? */
+               info.mem_unit/=1024;
+               info.totalram*=info.mem_unit;
+               info.totalswap*=info.mem_unit;
+       }
 
-       return((info.totalram+info.totalswap)/1024);
+       return(info.totalram+info.totalswap);
 }
 
 static void console_init()
@@ -745,7 +758,7 @@ 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;
 
@@ -772,64 +785,69 @@ 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') {
+                       if (strcmp(a->name, action) == 0) {
+                               if (*id != '\0') {
                                        struct stat statBuf;
 
                                        strcpy(tmpConsole, "/dev/");
-                                       strncat(tmpConsole, s, 200);
+                                       strncat(tmpConsole, id, 200);
                                        if (stat(tmpConsole, &statBuf) != 0) {
                                                message(LOG | CONSOLE,
                                                                "device '%s' does not exist.  Did you read the directions?\n",
                                                                tmpConsole);
                                                break;
                                        }
-                                       s = tmpConsole;
+                                       id = tmpConsole;
                                }
-                               new_initAction(a->action, q, s);
+                               new_initAction(a->action, process, id);
                                foundIt = TRUE;
                        }
                        a++;