Patch from Jeff Garzik marking a few 'getopt not needed' apps.

[oweals/busybox.git] / free.c

diff --git a/free.c b/free.c
index 78a36fe9a412690c78ef666e3c2a166a387afb71..41e872d12c689c8dafd8763e6ca6be5172bd426b 100644 (file)
--- a/free.c
+++ b/free.c
@@ -2,7 +2,7 @@
 /*
  * Mini free implementation for busybox
  *
- * Copyright (C) 1999 by Lineo, inc.
+ * Copyright (C) 1999,2000,2001 by Lineo, inc.
  * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21,22 +21,32 @@
  *
  */
 
-#include "internal.h"
 #include <stdio.h>
-#include <sys/sysinfo.h>
+#include <errno.h>
+#include <stdlib.h>
+#include "busybox.h"
 
-#define DIVISOR        1024
 extern int free_main(int argc, char **argv)
 {
        struct sysinfo info;
        sysinfo(&info);
-       info.totalram/=DIVISOR;
-       info.freeram/=DIVISOR;
-       info.totalswap/=DIVISOR;
-       info.freeswap/=DIVISOR;
-       info.sharedram/=DIVISOR;
-       info.bufferram/=DIVISOR;
 
+       /* Kernels prior to 2.4.x will return info.mem_unit==0, so cope... */
+       if (info.mem_unit==0) {
+               info.mem_unit=1;
+       }
+       info.mem_unit*=1024;
+       
+       /* TODO:  Make all this stuff not overflow when mem >= 4 Gib */
+       info.totalram/=info.mem_unit;
+       info.freeram/=info.mem_unit;
+       info.totalswap/=info.mem_unit;
+       info.freeswap/=info.mem_unit;
+       info.sharedram/=info.mem_unit;
+       info.bufferram/=info.mem_unit;
+
+       if (argc > 1 && **(argv + 1) == '-')
+               show_usage();
 
        printf("%6s%13s%13s%13s%13s%13s\n", "", "total", "used", "free", 
                        "shared", "buffers");
@@ -51,5 +61,7 @@ extern int free_main(int argc, char **argv)
        printf("%6s%13ld%13ld%13ld\n", "Total:", info.totalram+info.totalswap,
                        (info.totalram-info.freeram)+(info.totalswap-info.freeswap),
                        info.freeram+info.freeswap);
-       exit(TRUE);
+       return EXIT_SUCCESS;
 }
+
+