[BusyBox-cvs] busybox.stable free.c,1.19,1.20

[Erik Andersen]

Update of /var/cvs/busybox.stable
In directory winder:/tmp/cvs-serv8832

Modified Files:
	free.c 
Log Message:
Patch from Daniel J Walsh at redhat to make free work for systems 
with more than 1 GB of memory...


Index: free.c
===================================================================
RCS file: /var/cvs/busybox.stable/free.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- free.c	17 Sep 2002 07:44:26 -0000	1.19
+++ free.c	11 Jan 2003 20:40:49 -0000	1.20
@@ -37,17 +37,30 @@
 	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;
+	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;
+		info.totalswap/=info.mem_unit;
+		info.freeswap/=info.mem_unit;
 #endif
-	info.sharedram/=info.mem_unit;
-	info.bufferram/=info.mem_unit;
+		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) == '-')
 		show_usage();
@@ -69,5 +82,4 @@
 #endif
 	return EXIT_SUCCESS;
 }
-