mass renaming Kbuild -> Kbuild.src, Config.in -> Config.src

[platform/upstream/busybox.git] / procps / free.c

diff --git a/procps/free.c b/procps/free.c
index f2e746e..473d70b 100644 (file)
--- a/procps/free.c
+++ b/procps/free.c
@@ -2,65 +2,80 @@
 /*
  * Mini free implementation for busybox
  *
- * Copyright (C) 1999,2000 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
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
+ * Licensed under the GPL version 2, see the file LICENSE in this tarball.
  */
 
-#include "busybox.h"
-#include <stdio.h>
-#include <errno.h>
+/* getopt not needed */
 
-extern int free_main(int argc, char **argv)
+#include "libbb.h"
+
+int free_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int free_main(int argc UNUSED_PARAM, char **argv IF_NOT_DESKTOP(UNUSED_PARAM))
 {
        struct sysinfo info;
+       unsigned mem_unit;
+
+#if ENABLE_DESKTOP
+       if (argv[1] && argv[1][0] == '-')
+               bb_show_usage();
+#endif
+
        sysinfo(&info);
 
        /* Kernels prior to 2.4.x will return info.mem_unit==0, so cope... */
-       if (info.mem_unit==0) {
-               info.mem_unit=1;
+       mem_unit = 1;
+       if (info.mem_unit != 0) {
+               mem_unit = info.mem_unit;
        }
-       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);
-
-       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, 
-                       info.sharedram, info.bufferram);
-
-       printf("%6s%13ld%13ld%13ld\n", "Swap:", info.totalswap,
-                       info.totalswap-info.freeswap, info.freeswap);
+       /* Convert values to kbytes */
+       if (mem_unit == 1) {
+               info.totalram >>= 10;
+               info.freeram >>= 10;
+#if BB_MMU
+               info.totalswap >>= 10;
+               info.freeswap >>= 10;
+#endif
+               info.sharedram >>= 10;
+               info.bufferram >>= 10;
+       } else {
+               mem_unit >>= 10;
+               /* TODO:  Make all this stuff not overflow when mem >= 4 Tb */
+               info.totalram *= mem_unit;
+               info.freeram *= mem_unit;
+#if BB_MMU
+               info.totalswap *= mem_unit;
+               info.freeswap *= mem_unit;
+#endif
+               info.sharedram *= mem_unit;
+               info.bufferram *= mem_unit;
+       }
 
-       printf("%6s%13ld%13ld%13ld\n", "Total:", info.totalram+info.totalswap,
-                       (info.totalram-info.freeram)+(info.totalswap-info.freeswap),
-                       info.freeram+info.freeswap);
+       printf("      %13s%13s%13s%13s%13s\n",
+               "total",
+               "used",
+               "free",
+               "shared", "buffers" /* swap and total don't have these columns */
+       );
+       printf("%6s%13lu%13lu%13lu%13lu%13lu\n", "Mem:",
+               info.totalram,
+               info.totalram - info.freeram,
+               info.freeram,
+               info.sharedram, info.bufferram
+       );
+#if BB_MMU
+       printf("%6s%13lu%13lu%13lu\n", "Swap:",
+               info.totalswap,
+               info.totalswap - info.freeswap,
+               info.freeswap
+       );
+       printf("%6s%13lu%13lu%13lu\n", "Total:",
+               info.totalram + info.totalswap,
+               (info.totalram - info.freeram) + (info.totalswap - info.freeswap),
+               info.freeram + info.freeswap
+       );
+#endif
        return EXIT_SUCCESS;
 }
-
-