diff options
| author | Denys Vlasenko | 2018-02-23 17:00:23 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2018-02-23 17:00:23 +0100 |
| commit | 58cd6e1adef72e0c71c4ab9213196a720c9a926d (patch) | |
| tree | dfbfc91b93b61f1537890ed3f2601acc9c1fd398 | |
| parent | bf39d97e9d9422537970ed8c3af1b8270bdf0ac0 (diff) | |
| download | busybox-58cd6e1adef72e0c71c4ab9213196a720c9a926d.zip busybox-58cd6e1adef72e0c71c4ab9213196a720c9a926d.tar.gz | |
df: 4TB+ support on 32 bits arch
Reported for Pascal Bellard.
function old new delta
df_main 1054 1065 +11
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | coreutils/df.c | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/coreutils/df.c b/coreutils/df.c index 4076b5f..1ed09d0 100644 --- a/coreutils/df.c +++ b/coreutils/df.c @@ -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 UNUSED_PARAM, char **argv) { - unsigned long blocks_used; - unsigned blocks_percent_used; unsigned long df_disp_hr = 1024; int status = EXIT_SUCCESS; unsigned opt; @@ -222,20 +220,29 @@ int df_main(int argc UNUSED_PARAM, char **argv) s.f_frsize = s.f_bsize; 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) { s.f_blocks = s.f_files; s.f_bavail = s.f_bfree = s.f_ffree; s.f_frsize = 1; - if (df_disp_hr) df_disp_hr = 1; } blocks_used = s.f_blocks - s.f_bfree; - blocks_percent_used = 0; - if (blocks_used + s.f_bavail) { - blocks_percent_used = (blocks_used * 100ULL - + (blocks_used + s.f_bavail)/2 - ) / (blocks_used + s.f_bavail); + blocks_total = blocks_used + s.f_bavail; + blocks_percent_used = blocks_total; /* 0% if blocks_total == 0, else... */ + if (blocks_total != 0) { + /* Downscale sizes for narrower division */ + 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. */ |