[git commit master] ls: fix "ls | cat" to not show "total NNN" header

Denys Vlasenko vda.linux at googlemail.com
Fri Oct 23 14:22:25 UTC 2009


commit: http://git.busybox.net/busybox/commit/?id=d93fc617256f47a00f94f0603c0ff6b1b46e7ed4
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 coreutils/ls.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/coreutils/ls.c b/coreutils/ls.c
index 38cabca..13c863c 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -633,7 +633,7 @@ static void showdirs(struct dnode **dn, int first)
 		}
 		subdnp = list_dir((*dn)->fullname, &nfiles);
 #if ENABLE_DESKTOP
-		if (all_fmt & STYLE_LONG)
+		if ((all_fmt & STYLE_MASK) == STYLE_LONG)
 			printf("total %"OFF_FMT"u\n", calculate_blocks(subdnp));
 #endif
 		if (nfiles > 0) {
-- 
1.6.3.3



More information about the busybox-cvs mailing list