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

df: 4TB+ support on 32 bits arch

Browse Source 
Reported for Pascal Bellard.

function                                             old     new   delta
df_main                                             1054    1065     +11

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2018-02-23 17:00:23 +01:00
parent bf39d97e9d
commit 58cd6e1ade
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
coreutils/df.c
View File

@@ -91,8 +91,6 @@ static unsigned long kscale(unsigned long b, unsigned long bs)
int df_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int df_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int df_main(int argc UNUSED_PARAM, char **argv) int df_main(int argc UNUSED_PARAM, char **argv)
{ {
unsigned long blocks_used;
unsigned blocks_percent_used;
unsigned long df_disp_hr = 1024; unsigned long df_disp_hr = 1024;
int status = EXIT_SUCCESS; int status = EXIT_SUCCESS;
unsigned opt; unsigned opt;
@@ -222,20 +220,29 @@ int df_main(int argc UNUSED_PARAM, char **argv)
s.f_frsize = s.f_bsize; s.f_frsize = s.f_bsize;
if ((s.f_blocks > 0) || !mount_table || (opt & OPT_ALL)) { if ((s.f_blocks > 0) || !mount_table || (opt & OPT_ALL)) {
unsigned long long blocks_used;
unsigned long long blocks_total;
unsigned blocks_percent_used;
if (opt & OPT_INODE) { if (opt & OPT_INODE) {
s.f_blocks = s.f_files; s.f_blocks = s.f_files;
s.f_bavail = s.f_bfree = s.f_ffree; s.f_bavail = s.f_bfree = s.f_ffree;
s.f_frsize = 1; s.f_frsize = 1;
if (df_disp_hr) if (df_disp_hr)
df_disp_hr = 1; df_disp_hr = 1;
} }
blocks_used = s.f_blocks - s.f_bfree; blocks_used = s.f_blocks - s.f_bfree;
blocks_percent_used = 0; blocks_total = blocks_used + s.f_bavail;
if (blocks_used + s.f_bavail) { blocks_percent_used = blocks_total; /* 0% if blocks_total == 0, else... */
blocks_percent_used = (blocks_used * 100ULL if (blocks_total != 0) {
+ (blocks_used + s.f_bavail)/2 /* Downscale sizes for narrower division */
) / (blocks_used + s.f_bavail); unsigned u;
while (blocks_total >= INT_MAX / 101) {
blocks_total >>= 1;
blocks_used >>= 1;
}
u = (unsigned)blocks_used * 100u + (unsigned)blocks_total / 2;
blocks_percent_used = u / (unsigned)blocks_total;
} }
/* GNU coreutils 6.10 skips certain mounts, try to be compatible. */ /* GNU coreutils 6.10 skips certain mounts, try to be compatible. */