From 1d63f046d042bff32501ed0ef503dd77b9ca9b0a Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Sat, 3 Oct 2009 11:45:07 +0200
Subject: ls: forgotten chunk from prev commit
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
coreutils/ls.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/coreutils/ls.c b/coreutils/ls.c
index f8416898b..a067aa36c 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 */
--
cgit v1.2.3