mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-11-24 20:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not count hard links for dirs

Browse source
This commit is contained in:
Arun Prakash Jana 2020-02-28 01:57:33 +05:30
parent 9c100f987c
commit fc805dac26
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/nnn.c
View file

@ -3175,7 +3175,7 @@ static void printent(const struct entry *ent, uint namecols, bool sel)
char ind = get_ind(ent->mode, FALSE); char ind = get_ind(ent->mode, FALSE);
int attrs = sel ? A_REVERSE : 0; int attrs = sel ? A_REVERSE : 0;
if ((S_ISREG(ent->mode) && (ent->flags & HARD_LINK)) || ind == '@') if (ind == '@' || (ent->flags & HARD_LINK))
attrs |= A_DIM; attrs |= A_DIM;
if (!ind) if (!ind)
@ -4204,8 +4204,8 @@ static void launch_app(const char *path, char *newpath)
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 typeflag, struct FTW *UNUSED(ftwbuf))
{ {
if (sb->st_blocks && (typeflag == FTW_F || typeflag == FTW_D) if (sb->st_blocks && (typeflag == FTW_D
&& (sb->st_nlink <= 1 || test_set_bit((uint)sb->st_ino))) || (typeflag == FTW_F && (sb->st_nlink <= 1 || test_set_bit((uint)sb->st_ino)))))
ent_blocks += sb->st_blocks; ent_blocks += sb->st_blocks;
++num_files; ++num_files;
@ -4214,8 +4214,8 @@ static int sum_bsize(const char *UNUSED(fpath), const struct stat *sb, int typef
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 typeflag, struct FTW *UNUSED(ftwbuf))
{ {
if (sb->st_size && (typeflag == FTW_F || typeflag == FTW_D) if (sb->st_size && (typeflag == FTW_D
&& (sb->st_nlink <= 1 || test_set_bit((uint)sb->st_ino))) || (typeflag == FTW_D && (sb->st_nlink <= 1 || test_set_bit((uint)sb->st_ino)))))
ent_blocks += sb->st_size; ent_blocks += sb->st_size;
++num_files; ++num_files;
@ -4412,7 +4412,8 @@ static int dentfill(char *path, struct entry **dents)
dentp->mode = sb.st_mode; dentp->mode = sb.st_mode;
dentp->size = sb.st_size; dentp->size = sb.st_size;
#endif #endif
dentp->flags = (sb.st_nlink > 1) ? HARD_LINK : 0; dentp->flags = S_ISDIR(sb.st_mode) ? 0 : ((sb.st_nlink > 1) ? HARD_LINK : 0);
DPRINTF_D(dentp->flags);
if (cfg.blkorder) { if (cfg.blkorder) {
if (S_ISDIR(sb.st_mode)) { if (S_ISDIR(sb.st_mode)) {