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 98a58f275edc55d568663525546a78c11aeecd29..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>
@@ -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()