Skip to content

human-readable: calculate numbers in a loop #872

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eworm-de wants to merge 1 commit into
base: master
Choose a base branch
from
+19 −21
Open

human-readable: calculate numbers in a loop #872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 16 additions & 18 deletions lib/compat.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,26 +181,24 @@ char *do_big_num(int64 num, int human_flag, const char *fract)

if (human_flag > 1) {
int mult = human_flag == 2 ? 1000 : 1024;

if (num >= mult || num <= -mult) {
double dnum = (double)num / mult;
char units;
if (num < 0)
dnum = -dnum;
if (dnum < mult)
units = 'K';
else if ((dnum /= mult) < mult)
units = 'M';
else if ((dnum /= mult) < mult)
units = 'G';
else if ((dnum /= mult) < mult)
units = 'T';
else {
dnum /= mult;
units = 'P';
const char* units = " KMGTPEZY";
int64 powi = 1;

for (;;) {
if (labs(num / mult) < powi)
break;

if (units[1] == '\0')
break;

powi *= mult;
++units;
}
if (num < 0)
dnum = -dnum;
snprintf(bufs[n], sizeof bufs[0], "%.2f%c", dnum, units);

snprintf(bufs[n], sizeof bufs[0], "%.2f%c",
(double) num / powi, *units);
return bufs[n];
}
}
Expand Down
6 changes: 3 additions & 3 deletions rsync.1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3326,9 +3326,9 @@ expand it.
digits) by specifying the `--no-human-readable` (`--no-h`) option.

The unit letters that are appended in levels 2 and 3 are: `K` (kilo), `M`
(mega), `G` (giga), `T` (tera), or `P` (peta). For example, a 1234567-byte
file would output as 1.23M in level-2 (assuming that a period is your local
decimal point).
(mega), `G` (giga), `T` (tera), `P` (peta), `E` (exa), `Z` (zetta) or `Y`
(yotta). For example, a 1234567-byte file would output as 1.23M in level-2
(assuming that a period is your local decimal point).

Backward compatibility note: versions of rsync prior to 3.1.0 do not
support human-readable level 1, and they default to level 0. Thus,
Expand Down
Loading