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 #941: on macOS set depth to OPEN_MAX for nftw()

Browse source
This commit is contained in:
Arun Prakash Jana 2021-04-11 01:01:07 +05:30
parent 99a8f761cf
commit ee04215d91
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/nnn.c
View file

@ -863,6 +863,7 @@ static bool test_set_bit(uint_t nr)
return TRUE; return TRUE;
} }
#ifndef __APPLE__
/* Increase the limit on open file descriptors, if possible */ /* Increase the limit on open file descriptors, if possible */
static rlim_t max_openfds(void) static rlim_t max_openfds(void)
{ {
@ -888,6 +889,7 @@ static rlim_t max_openfds(void)
return limit; return limit;
} }
#endif
/* /*
* Wrapper to realloc() * Wrapper to realloc()
@ -4905,11 +4907,13 @@ static void dentfree(void)
static blkcnt_t dirwalk(char *path, struct stat *psb) static blkcnt_t dirwalk(char *path, struct stat *psb)
{ {
#ifndef __APPLE__
static uint_t open_max; static uint_t open_max;
/* Increase current open file descriptor limit */ /* Increase current open file descriptor limit */
if (!open_max) if (!open_max)
open_max = max_openfds(); open_max = max_openfds();
#endif
ent_blocks = 0; ent_blocks = 0;
tolastln(); tolastln();
@ -4917,7 +4921,11 @@ static blkcnt_t dirwalk(char *path, struct stat *psb)
addstr(" [^C aborts]\n"); addstr(" [^C aborts]\n");
refresh(); refresh();
#ifndef __APPLE__
if (nftw(path, nftw_fn, open_max, FTW_MOUNT | FTW_PHYS) < 0) { if (nftw(path, nftw_fn, open_max, FTW_MOUNT | FTW_PHYS) < 0) {
#else
if (nftw(path, nftw_fn, OPEN_MAX, FTW_MOUNT | FTW_PHYS) < 0) {
#endif
DPRINTF_S("nftw failed"); DPRINTF_S("nftw failed");
return cfg.apparentsz ? psb->st_size : psb->st_blocks; return cfg.apparentsz ? psb->st_size : psb->st_blocks;
} }