diff options
| author | Eric Andersen | 2001-03-07 03:50:03 +0000 |
|---|---|---|
| committer | Eric Andersen | 2001-03-07 03:50:03 +0000 |
| commit | 5986f8d1c6aeff1b9eca4fedd2ca4eedcefef884 (patch) | |
| tree | 9223ba525569305798bacf0775f500aa5ae6cf11 | |
| parent | 651f8c04ef62ec4987156933ac4e1cc8d313562a (diff) | |
| download | busybox-5986f8d1c6aeff1b9eca4fedd2ca4eedcefef884.zip busybox-5986f8d1c6aeff1b9eca4fedd2ca4eedcefef884.tar.gz | |
Fix up df so it works properly
-Erik
| -rw-r--r-- | coreutils/df.c | 15 | ||||
| -rw-r--r-- | df.c | 15 |
2 files changed, 10 insertions, 20 deletions
diff --git a/coreutils/df.c b/coreutils/df.c index 0d1e176..1f5e4b0 100644 --- a/coreutils/df.c +++ b/coreutils/df.c @@ -40,7 +40,7 @@ static int df(char *device, const char *mountPoint) long blocks_used; long blocks_percent_used; #ifdef BB_FEATURE_HUMAN_READABLE - long divisor, base; + long base; #endif if (statfs(mountPoint, &s) != 0) { @@ -61,28 +61,23 @@ static int df(char *device, const char *mountPoint) * or leaves device alone if it can't find it */ find_real_root_device_name( device); } -#ifdef BB_FEATURE_HUMAN_READABLE + #ifdef BB_FEATURE_HUMAN_READABLE switch (disp_hr) { case MEGABYTE: - divisor = KILOBYTE; base = KILOBYTE; break; case KILOBYTE: - divisor = KILOBYTE; base = 1; break; default: - divisor = KILOBYTE; base = 0; } - printf("%-20s %9s ", device, - format((s.f_blocks * (s.f_bsize / divisor)), base)); + format(s.f_blocks * (s.f_bsize/KILOBYTE), base)); printf("%9s ", - format(((s.f_blocks - s.f_bfree) * - (s.f_bsize / divisor)), base)); + format((s.f_blocks - s.f_bfree) * (s.f_bsize/KILOBYTE), base)); printf("%9s %3ld%% %s\n", - format((s.f_bavail * (s.f_bsize / divisor)), base), + format(s.f_bavail * (s.f_bsize/KILOBYTE), base), blocks_percent_used, mountPoint); #else printf("%-20s %9ld %9ld %9ld %3ld%% %s\n", @@ -40,7 +40,7 @@ static int df(char *device, const char *mountPoint) long blocks_used; long blocks_percent_used; #ifdef BB_FEATURE_HUMAN_READABLE - long divisor, base; + long base; #endif if (statfs(mountPoint, &s) != 0) { @@ -61,28 +61,23 @@ static int df(char *device, const char *mountPoint) * or leaves device alone if it can't find it */ find_real_root_device_name( device); } -#ifdef BB_FEATURE_HUMAN_READABLE + #ifdef BB_FEATURE_HUMAN_READABLE switch (disp_hr) { case MEGABYTE: - divisor = KILOBYTE; base = KILOBYTE; break; case KILOBYTE: - divisor = KILOBYTE; base = 1; break; default: - divisor = KILOBYTE; base = 0; } - printf("%-20s %9s ", device, - format((s.f_blocks * (s.f_bsize / divisor)), base)); + format(s.f_blocks * (s.f_bsize/KILOBYTE), base)); printf("%9s ", - format(((s.f_blocks - s.f_bfree) * - (s.f_bsize / divisor)), base)); + format((s.f_blocks - s.f_bfree) * (s.f_bsize/KILOBYTE), base)); printf("%9s %3ld%% %s\n", - format((s.f_bavail * (s.f_bsize / divisor)), base), + format(s.f_bavail * (s.f_bsize/KILOBYTE), base), blocks_percent_used, mountPoint); #else printf("%-20s %9ld %9ld %9ld %3ld%% %s\n", |