Rewritten by Manuel Novoa III.

[oweals/busybox.git] / free.c

diff --git a/free.c b/free.c
index 7c9d7f10ac1b83604086a5b04888004635ceda80..2e34a972c0b0c51712ccc72750a54a53d9d7dc3a 100644 (file)
--- a/free.c
+++ b/free.c
@@ -2,7 +2,7 @@
 /*
  * Mini free implementation for busybox
  *
- * Copyright (C) 1999,2000 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,46 +21,34 @@
  *
  */
 
-#include "internal.h"
+/* getopt not needed */
+
 #include <stdio.h>
 #include <errno.h>
-
-const char free_usage[] =
-       "free\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-       "\nDisplays the amount of free and used system memory\n"
-#endif
-       ;
+#include <stdlib.h>
+#include "busybox.h"
 
 extern int free_main(int argc, char **argv)
 {
        struct sysinfo info;
        sysinfo(&info);
-       /* Kernels prior to 2.4.x will return info.mem_unit==0.  Kernels after
-        * 2.4.x actually fill this value in */
+
+       /* Kernels prior to 2.4.x will return info.mem_unit==0, so cope... */
        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.freeram/=info.mem_unit;
-               info.totalswap/=info.mem_unit;
-               info.freeswap/=info.mem_unit;
-               info.sharedram/=info.mem_unit;
-               info.bufferram/=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.freeram*=info.mem_unit;
-               info.totalswap*=info.mem_unit;
-               info.freeswap*=info.mem_unit;
-               info.sharedram*=info.mem_unit;
-               info.bufferram*=info.mem_unit;
+               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) == '-')
-               usage(free_usage);
+               show_usage();
 
        printf("%6s%13s%13s%13s%13s%13s\n", "", "total", "used", "free", 
                        "shared", "buffers");
@@ -75,7 +63,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);
-       return(TRUE);
+       return EXIT_SUCCESS;
 }