summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2014-02-27 14:40:26 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2014-02-27 14:40:26 (GMT)
commitfca0ee5959f212e46b9a5bb324a1482899172750 (patch)
tree7d13ce1f148d737fb0f68e23320d55a6613b5512
parent3795266841393c9d1cd34c62ccaecded6d7c3dfb (diff)
downloadbusybox-fca0ee5959f212e46b9a5bb324a1482899172750.tar.gz
busybox-fca0ee5959f212e46b9a5bb324a1482899172750.tar.bz2
ls: make "ls -s DIR" show total too. Clases 4946
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--coreutils/ls.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 166473d..1b63be5 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -1032,7 +1032,7 @@ static void scan_and_display_dirs_recur(struct dnode **dn, int first)
}
subdnp = scan_one_dir((*dn)->fullname, &nfiles);
#if ENABLE_DESKTOP
- if ((G.all_fmt & STYLE_MASK) == STYLE_LONG)
+ if ((G.all_fmt & STYLE_MASK) == STYLE_LONG || (G.all_fmt & LIST_BLOCKS))
printf("total %"OFF_FMT"u\n", calculate_blocks(subdnp));
#endif
if (nfiles > 0) {