emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed df.c so that nfs volumes will display properly (fixing bug #1113).

Browse Source 
Problem was 512/1024 = 0 if you use longs, so I cast KILOBYTE to a double, then
cast the result back to an int after the math is done, letting C's type
promotion do its magic for the rest.
 -Erik
This commit is contained in:
Eric Andersen 2001-03-09 22:42:26 +00:00
parent 4aaf89f49f
commit d92168486b
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
coreutils/df.c
View File

@ -74,18 +74,22 @@ static int do_df(char *device, const char *mount_point)
base = 0; base = 0;
} }
printf("%-20s %9s ", device, printf("%-20s %9s ", device,
make_human_readable_str(s.f_blocks * (s.f_bsize/KILOBYTE), base)); make_human_readable_str((unsigned long)(s.f_blocks *
(s.f_bsize/(double)KILOBYTE)), base));
printf("%9s ", printf("%9s ",
make_human_readable_str((s.f_blocks - s.f_bfree) * (s.f_bsize/KILOBYTE), base)); make_human_readable_str((unsigned long)(
(s.f_blocks - s.f_bfree) *
(s.f_bsize/(double)KILOBYTE)), base));
printf("%9s %3ld%% %s\n", printf("%9s %3ld%% %s\n",
make_human_readable_str(s.f_bavail * (s.f_bsize/KILOBYTE), base), make_human_readable_str((unsigned long)(s.f_bavail *
(s.f_bsize/(double)KILOBYTE)), base),
blocks_percent_used, mount_point); blocks_percent_used, mount_point);
#else #else
printf("%-20s %9ld %9ld %9ld %3ld%% %s\n", printf("%-20s %9ld %9ld %9ld %3ld%% %s\n",
device, device,
(long) (s.f_blocks * (s.f_bsize / KILOBYTE)), (long) (s.f_blocks * (s.f_bsize / (double)KILOBYTE)),
(long) ((s.f_blocks - s.f_bfree) * (s.f_bsize / KILOBYTE)), (long) ((s.f_blocks - s.f_bfree)*(s.f_bsize/(double)KILOBYTE)),
(long) (s.f_bavail * (s.f_bsize / KILOBYTE)), (long) (s.f_bavail * (s.f_bsize / (double)KILOBYTE)),
blocks_percent_used, mount_point); blocks_percent_used, mount_point);
#endif #endif
} }

16
df.c
View File

@ -74,18 +74,22 @@ static int do_df(char *device, const char *mount_point)
base = 0; base = 0;
} }
printf("%-20s %9s ", device, printf("%-20s %9s ", device,
make_human_readable_str(s.f_blocks * (s.f_bsize/KILOBYTE), base)); make_human_readable_str((unsigned long)(s.f_blocks *
(s.f_bsize/(double)KILOBYTE)), base));
printf("%9s ", printf("%9s ",
make_human_readable_str((s.f_blocks - s.f_bfree) * (s.f_bsize/KILOBYTE), base)); make_human_readable_str((unsigned long)(
(s.f_blocks - s.f_bfree) *
(s.f_bsize/(double)KILOBYTE)), base));
printf("%9s %3ld%% %s\n", printf("%9s %3ld%% %s\n",
make_human_readable_str(s.f_bavail * (s.f_bsize/KILOBYTE), base), make_human_readable_str((unsigned long)(s.f_bavail *
(s.f_bsize/(double)KILOBYTE)), base),
blocks_percent_used, mount_point); blocks_percent_used, mount_point);
#else #else
printf("%-20s %9ld %9ld %9ld %3ld%% %s\n", printf("%-20s %9ld %9ld %9ld %3ld%% %s\n",
device, device,
(long) (s.f_blocks * (s.f_bsize / KILOBYTE)), (long) (s.f_blocks * (s.f_bsize / (double)KILOBYTE)),
(long) ((s.f_blocks - s.f_bfree) * (s.f_bsize / KILOBYTE)), (long) ((s.f_blocks - s.f_bfree)*(s.f_bsize/(double)KILOBYTE)),
(long) (s.f_bavail * (s.f_bsize / KILOBYTE)), (long) (s.f_bavail * (s.f_bsize / (double)KILOBYTE)),
blocks_percent_used, mount_point); blocks_percent_used, mount_point);
#endif #endif
} }