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

ls: When -h is passed, the total should also be in human units

Browse Source 
Signed-off-by: Lauri Kasanen <cand@gmx.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Lauri Kasanen 2018-08-01 19:51:17 +03:00 committed by Denys Vlasenko
parent 9408978a43
commit a380aacca6
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
coreutils/ls.c
View File

@ -1016,7 +1016,15 @@ static void scan_and_display_dirs_recur(struct dnode **dn, int first)
subdnp = scan_one_dir((*dn)->fullname, &nfiles);
#if ENABLE_DESKTOP
if (option_mask32 & (OPT_s|OPT_l)) {
printf("total %"OFF_FMT"u\n", calculate_blocks(subdnp));
if (option_mask32 & OPT_h) {
printf("total %-"HUMAN_READABLE_MAX_WIDTH_STR"s\n",
/* print size, no fractions, use suffixes */
make_human_readable_str(calculate_blocks(subdnp) * 1024,
0, 0)
);
} else {
printf("total %"OFF_FMT"u\n", calculate_blocks(subdnp));
}
}
#endif
if (nfiles > 0) {