Move sed over to the generic llist_t for append. Saves about 90 bytes.

[oweals/busybox.git] / procps / free.c

diff --git a/procps/free.c b/procps/free.c
index f2e746e396e21f57457a6920b16862cbd4a51d63..b4163f108489926b8f9ce84f17223afa759344bb 100644 (file)
--- a/procps/free.c
+++ b/procps/free.c
@@ -2,8 +2,7 @@
 /*
  * Mini free implementation for busybox
  *
- * Copyright (C) 1999,2000 by Lineo, inc.
- * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,11 +20,14 @@
  *
  */
 
-#include "busybox.h"
+/* getopt not needed */
+
 #include <stdio.h>
 #include <errno.h>
+#include <stdlib.h>
+#include "busybox.h"
 
-extern int free_main(int argc, char **argv)
+int free_main(int argc, char **argv)
 {
        struct sysinfo info;
        sysinfo(&info);
@@ -34,33 +36,49 @@ extern int free_main(int argc, char **argv)
        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 ( 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;
+#ifndef __uClinux__
+               info.totalswap/=info.mem_unit;
+               info.freeswap/=info.mem_unit;
+#endif
+               info.sharedram/=info.mem_unit;
+               info.bufferram/=info.mem_unit;
+       } else {
+               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;
+#ifndef __uClinux__
+               info.totalswap*=info.mem_unit;
+               info.freeswap*=info.mem_unit;
+#endif
+               info.sharedram*=info.mem_unit;
+               info.bufferram*=info.mem_unit;
+       }
 
        if (argc > 1 && **(argv + 1) == '-')
-               usage(free_usage);
+               bb_show_usage();
 
-       printf("%6s%13s%13s%13s%13s%13s\n", "", "total", "used", "free", 
+       printf("%6s%13s%13s%13s%13s%13s\n", "", "total", "used", "free",
                        "shared", "buffers");
 
-       printf("%6s%13ld%13ld%13ld%13ld%13ld\n", "Mem:", info.totalram, 
-                       info.totalram-info.freeram, info.freeram, 
+       printf("%6s%13ld%13ld%13ld%13ld%13ld\n", "Mem:", info.totalram,
+                       info.totalram-info.freeram, info.freeram,
                        info.sharedram, info.bufferram);
 
+#ifndef __uClinux__
        printf("%6s%13ld%13ld%13ld\n", "Swap:", info.totalswap,
                        info.totalswap-info.freeswap, info.freeswap);
 
        printf("%6s%13ld%13ld%13ld\n", "Total:", info.totalram+info.totalswap,
                        (info.totalram-info.freeram)+(info.totalswap-info.freeswap),
                        info.freeram+info.freeswap);
+#endif
        return EXIT_SUCCESS;
 }
 
-