From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 3 Jan 2015 13:58:15 +0100 Subject: patch to Vanilla Tomato 1.28 --- release/src/router/busybox/procps/free.c | 38 +++++++++----------------------- 1 file changed, 11 insertions(+), 27 deletions(-) (limited to 'release/src/router/busybox/procps/free.c') diff --git a/release/src/router/busybox/procps/free.c b/release/src/router/busybox/procps/free.c index dbc606c9..e76dd21a 100644 --- a/release/src/router/busybox/procps/free.c +++ b/release/src/router/busybox/procps/free.c @@ -2,41 +2,26 @@ /* * Mini free implementation for busybox * - * Copyright (C) 1999-2003 by Erik Andersen - * - * 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 * + * Licensed under the GPL version 2, see the file LICENSE in this tarball. */ /* getopt not needed */ -#include -#include -#include -#include "busybox.h" +#include "libbb.h" -extern int free_main(int argc, char **argv) +int free_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int free_main(int argc, char **argv) { struct sysinfo info; sysinfo(&info); /* Kernels prior to 2.4.x will return info.mem_unit==0, so cope... */ - if (info.mem_unit==0) { + if (info.mem_unit == 0) { info.mem_unit=1; } - if ( info.mem_unit == 1 ) { + if (info.mem_unit == 1) { info.mem_unit=1024; /* TODO: Make all this stuff not overflow when mem >= 4 Gib */ @@ -61,14 +46,14 @@ extern int free_main(int argc, char **argv) info.bufferram*=info.mem_unit; } - if (argc > 1 && **(argv + 1) == '-') + if (argc > 1 && *argv[1] == '-') 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__ @@ -81,4 +66,3 @@ extern int free_main(int argc, char **argv) #endif return EXIT_SUCCESS; } - -- cgit v1.2.3-54-g00ecf