[git commit master] ls: forgotten chunk from prev commit

Denys Vlasenko vda.linux at googlemail.com
Sat Oct 3 09:45:07 UTC 2009


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

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

diff --git a/coreutils/ls.c b/coreutils/ls.c
index f841689..a067aa3 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -592,13 +592,15 @@ static void showfiles(struct dnode **dn, unsigned nfiles)
  * number of units.
  */
 /* by Jorgen Overgaard (jorgen AT antistaten.se) */
-static off_t calculate_blocks(struct dnode **dn, int nfiles)
+static off_t calculate_blocks(struct dnode **dn)
 {
 	uoff_t blocks = 1;
-	while (nfiles) {
-		blocks += (*dn)->dstat.st_blocks; /* in 512 byte blocks */
-		dn++;
-		nfiles--;
+	if (dn) {
+		while (*dn) {
+			/* st_blocks is in 512 byte blocks */
+			blocks += (*dn)->dstat.st_blocks;
+			dn++;
+		}
 	}
 
 	/* Even though standard says use 512 byte blocks, coreutils use 1k */
-- 
1.6.3.3



More information about the busybox-cvs mailing list