From: Arun Prakash Jana <engineerarun@gmail.com>
Date: Sun, 23 May 2021 21:26:12 +0000 (+0530)
Subject: Dynamic view update in disk usage mode
X-Git-Tag: v4.1~31
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=fdeba8a87ee9f8ef4d2465da9eb32e8b39c7d7f2;p=nnn.git

Dynamic view update in disk usage mode
---

diff --git a/src/nnn.c b/src/nnn.c
index f19bc835..9d8abf98 100644
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -4954,22 +4954,18 @@ static bool handle_cmd(enum action sel, const char *current, char *newpath)
 	return TRUE;
 }
 
-static int sum_bsize(const char *UNUSED(fpath), const struct stat *sb, int typeflag, struct FTW *UNUSED(ftwbuf))
+static int sum_bsize(const char *UNUSED(fpath), const struct stat *sb, int UNUSED(typeflag), struct FTW *UNUSED(ftwbuf))
 {
-	if (sb->st_blocks
-	    && ((typeflag == FTW_F && (sb->st_nlink <= 1 || test_set_bit((uint_t)sb->st_ino)))
-	    || typeflag == FTW_D))
+	if (sb->st_blocks && (sb->st_nlink <= 1 || test_set_bit((uint_t)sb->st_ino)))
 		ent_blocks += sb->st_blocks;
 
 	++num_files;
 	return 0;
 }
 
-static int sum_asize(const char *UNUSED(fpath), const struct stat *sb, int typeflag, struct FTW *UNUSED(ftwbuf))
+static int sum_asize(const char *UNUSED(fpath), const struct stat *sb, int UNUSED(typeflag), struct FTW *UNUSED(ftwbuf))
 {
-	if (sb->st_size
-	    && ((typeflag == FTW_F && (sb->st_nlink <= 1 || test_set_bit((uint_t)sb->st_ino)))
-	    || typeflag == FTW_D))
+	if (sb->st_size && (sb->st_nlink <= 1 || test_set_bit((uint_t)sb->st_ino)))
 		ent_blocks += sb->st_size;
 
 	++num_files;
@@ -5100,6 +5096,8 @@ static int dentfill(char *path, struct entry **ppdents)
 
 					if (g_state.interrupt)
 						goto exit;
+					ndents = n;
+					redraw(path);
 				}
 			} else {
 				/* Do not recount hard links */
@@ -5232,6 +5230,8 @@ static int dentfill(char *path, struct entry **ppdents)
 
 				if (g_state.interrupt)
 					goto exit;
+				ndents = n;
+				redraw(path);
 			} else {
 				dentp->blocks = (cfg.apparentsz ? sb.st_size : sb.st_blocks);
 				/* Do not recount hard links */