mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-11-28 05:41:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling hard-links

Browse source
This commit is contained in:
Arun Prakash Jana 2020-02-27 18:49:44 +05:30
parent 74e77f78fa
commit 95356681ff
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/nnn.c
View file

@ -165,7 +165,7 @@
#define BLK_SHIFT_512 9 #define BLK_SHIFT_512 9
/* Detect hardlinks in du */ /* Detect hardlinks in du */
#define HASH_BITS (0xFFFF) #define HASH_BITS (0xFFFFFF)
#define HASH_OCTETS (HASH_BITS >> 6) /* 2^6 = 64 */ #define HASH_OCTETS (HASH_BITS >> 6) /* 2^6 = 64 */
/* Program return codes */ /* Program return codes */
@ -700,8 +700,10 @@ static char *xitoa(uint val)
/* /*
* Source: https://elixir.bootlin.com/linux/latest/source/arch/alpha/include/asm/bitops.h * Source: https://elixir.bootlin.com/linux/latest/source/arch/alpha/include/asm/bitops.h
*/ */
static bool test_set_bit(ulong nr) static bool test_set_bit(uint nr)
{ {
nr &= HASH_BITS;
ull *m = ((ull *)ihashbmp) + (nr >> 6); ull *m = ((ull *)ihashbmp) + (nr >> 6);
if (*m & (1 << (nr & 63))) if (*m & (1 << (nr & 63)))
@ -713,8 +715,10 @@ static bool test_set_bit(ulong nr)
} }
#if 0 #if 0
static bool test_clear_bit(ulong nr) static bool test_clear_bit(uint nr)
{ {
nr &= HASH_BITS;
ull *m = ((ull *) ihashbmp) + (nr >> 6); ull *m = ((ull *) ihashbmp) + (nr >> 6);
if (!(*m & (1 << (nr & 63)))) if (!(*m & (1 << (nr & 63))))
@ -4189,7 +4193,7 @@ 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_F || typeflag == FTW_D)
&& (sb->st_nlink <= 1 || test_set_bit((ulong)sb->st_ino + (ulong)sb->st_size))) && (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;
@ -4199,7 +4203,7 @@ 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_F || typeflag == FTW_D)
&& (sb->st_nlink <= 1 || test_set_bit((ulong)sb->st_ino + (ulong)sb->st_size))) && (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;
@ -4319,8 +4323,7 @@ static int dentfill(char *path, struct entry **dents)
} }
} else { } else {
/* Do not recount hard links */ /* Do not recount hard links */
if (sb.st_nlink <= 1 if (sb.st_nlink <= 1 || test_set_bit((uint)sb.st_ino))
|| test_set_bit((ulong)sb.st_ino + (ulong)sb.st_size))
dir_blocks += (cfg.apparentsz ? sb.st_size : sb.st_blocks); dir_blocks += (cfg.apparentsz ? sb.st_size : sb.st_blocks);
++num_files; ++num_files;
} }
@ -4417,8 +4420,7 @@ static int dentfill(char *path, struct entry **dents)
} else { } else {
dentp->blocks = (cfg.apparentsz ? sb.st_size : sb.st_blocks); dentp->blocks = (cfg.apparentsz ? sb.st_size : sb.st_blocks);
/* Do not recount hard links */ /* Do not recount hard links */
if (sb.st_nlink <= 1 if (sb.st_nlink <= 1 || test_set_bit((uint)sb.st_ino))
|| test_set_bit((ulong)sb.st_ino + (ulong)sb.st_size))
dir_blocks += dentp->blocks; dir_blocks += dentp->blocks;
++num_files; ++num_files;
} }