mirrors
/
nnn
mirror of https://github.com/jarun/nnn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add if blocks used (helps in large dirs)

This commit is contained in:
Arun Prakash Jana 2017-06-22 07:07:51 +05:30
parent 90680cb370
commit ad4e35215b
No known key found for this signature in database
GPG Key ID: A75979F35C080412
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
nnn.c
View File

@ -168,7 +168,7 @@ static char *copier;
static char *editor; static char *editor;
static char *desktop_manager; static char *desktop_manager;
static off_t blk_size; static off_t blk_size;
static off_t dir_size; static off_t dir_blocks;
static size_t fs_free; static size_t fs_free;
static uint open_max; static uint open_max;
static bm bookmark[MAX_BM]; static bm bookmark[MAX_BM];
@ -1428,7 +1428,7 @@ static int
sum_bsizes(const char *fpath, const struct stat *sb, sum_bsizes(const char *fpath, const struct stat *sb,
int typeflag, struct FTW *ftwbuf) int typeflag, struct FTW *ftwbuf)
{ {
if (typeflag == FTW_F || typeflag == FTW_D) if (sb->st_blocks && (typeflag == FTW_F || typeflag == FTW_D))
blk_size += sb->st_blocks; blk_size += sb->st_blocks;
return 0; return 0;
@ -1480,7 +1480,7 @@ dentfill(char *path, struct entry **dents,
n = 0; n = 0;
if (cfg.bsizeorder) if (cfg.bsizeorder)
dir_size = 0; dir_blocks = 0;
dirp = opendir(path); dirp = opendir(path);
if (dirp == NULL) if (dirp == NULL)
@ -1509,11 +1509,11 @@ dentfill(char *path, struct entry **dents,
if (nftw(newpath, sum_bsizes, open_max, if (nftw(newpath, sum_bsizes, open_max,
FTW_MOUNT | FTW_PHYS) == -1) { FTW_MOUNT | FTW_PHYS) == -1) {
printmsg("nftw(3) failed"); printmsg("nftw(3) failed");
dir_size += sb.st_blocks; dir_blocks += sb.st_blocks;
} else } else
dir_size += blk_size; dir_blocks += blk_size;
} else } else if (sb.st_blocks)
dir_size += sb.st_blocks; dir_blocks += sb.st_blocks;
continue; continue;
} }
@ -1543,7 +1543,8 @@ dentfill(char *path, struct entry **dents,
} else } else
(*dents)[n].bsize = sb.st_blocks; (*dents)[n].bsize = sb.st_blocks;
dir_size += (*dents)[n].bsize; if ((*dents)[n].bsize)
dir_blocks += (*dents)[n].bsize;
} }
++n; ++n;
@ -1695,7 +1696,7 @@ redraw(char *path)
replace_escape(dents[cur].name), ind); replace_escape(dents[cur].name), ind);
else { else {
i = sprintf(g_buf, "du: %s in dir, ", i = sprintf(g_buf, "du: %s in dir, ",
coolsize(dir_size << 9)); coolsize(dir_blocks << 9));
sprintf(g_buf + i, "%s free [%s%s]", coolsize(fs_free), sprintf(g_buf + i, "%s free [%s%s]", coolsize(fs_free),
replace_escape(dents[cur].name), ind); replace_escape(dents[cur].name), ind);
} }