diff options
| author | Eric Andersen <andersen@codepoet.org> | 2000-09-10 16:10:41 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2000-09-10 16:10:41 +0000 |
| commit | 73de6561cae5e8707f66ba08203c082cd86e9850 (patch) | |
| tree | 33945d4d5824736ea2f36d742bb145a24d0d3386 | |
| parent | 729216cb11f263d16bc7322788842234642ab6ab (diff) | |
| download | busybox-73de6561cae5e8707f66ba08203c082cd86e9850.tar.gz | |
Update free for current 2.4.x behavior...
-Erik
| -rw-r--r-- | free.c | 34 | ||||
| -rw-r--r-- | procps/free.c | 34 |
2 files changed, 26 insertions, 42 deletions
@@ -29,29 +29,21 @@ 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); diff --git a/procps/free.c b/procps/free.c index 78298cfb6..d8c3f0b91 100644 --- a/procps/free.c +++ b/procps/free.c @@ -29,29 +29,21 @@ 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); |