mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2025-01-10 01:49:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor dentfill()

Browse source
This commit is contained in:
Arun Prakash Jana 2019-04-27 16:12:11 +05:30
parent 12a4ab3248
commit ce6fc35929
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 36 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/nnn.c
View file

@ -2637,7 +2637,7 @@ static void dentfree(void)
static int dentfill(char *path, struct entry **dents) static int dentfill(char *path, struct entry **dents)
{ {
int n = 0, count; int n = 0, count, flags = 0;
ulong num_saved; ulong num_saved;
struct dirent *dp; struct dirent *dp;
char *namep, *pnb; char *namep, *pnb;
@ -2667,7 +2667,22 @@ static int dentfill(char *path, struct entry **dents)
open_max = max_openfds(); open_max = max_openfds();
} }
while ((dp = readdir(dirp))) { dp = readdir(dirp);
// if (!dp) /* We have opened the dir, at least . would be returned */
// goto exit;
if (cfg.blkorder || dp->d_type == DT_UNKNOWN) {
/*
* Optimization added for filesystems which support dirent.d_type
* see readdir(3)
* Known drawbacks:
* - the symlink size is set to 0
* - the modification time of the symlink is set to that of the target file
*/
flags = AT_SYMLINK_NOFOLLOW;
}
do {
namep = dp->d_name; namep = dp->d_name;
/* Skip self and parent */ /* Skip self and parent */
@ -2711,7 +2726,7 @@ static int dentfill(char *path, struct entry **dents)
continue; continue;
} }
if (fstatat(fd, namep, &sb, AT_SYMLINK_NOFOLLOW) == -1) { if (fstatat(fd, namep, &sb, flags) == -1) {
DPRINTF_S(namep); DPRINTF_S(namep);
continue; continue;
} }
@ -2760,9 +2775,14 @@ static int dentfill(char *path, struct entry **dents)
off += dentp->nlen; off += dentp->nlen;
/* Copy other fields */ /* Copy other fields */
dentp->mode = sb.st_mode;
dentp->t = sb.st_mtime; dentp->t = sb.st_mtime;
dentp->size = sb.st_size; if (dp->d_type == DT_LNK && !flags) { /* Do not add sizes for links */
dentp->mode = (sb.st_mode & ~S_IFMT) | S_IFLNK;
dentp->size = 0;
} else {
dentp->mode = sb.st_mode;
dentp->size = sb.st_size;
}
dentp->flags = 0; dentp->flags = 0;
if (cfg.blkorder) { if (cfg.blkorder) {
@ -2796,18 +2816,22 @@ static int dentfill(char *path, struct entry **dents)
} }
} }
/* Flag if this is a dir or symlink to a dir */ if (flags) {
if (S_ISLNK(sb.st_mode)) { /* Flag if this is a dir or symlink to a dir */
sb.st_mode = 0; if (S_ISLNK(sb.st_mode)) {
fstatat(fd, namep, &sb, 0); sb.st_mode = 0;
} fstatat(fd, namep, &sb, 0);
}
if (S_ISDIR(sb.st_mode)) if (S_ISDIR(sb.st_mode))
dentp->flags |= DIR_OR_LINK_TO_DIR;
} else if (dp->d_type == DT_DIR || (dp->d_type == DT_LNK && S_ISDIR(sb.st_mode)))
dentp->flags |= DIR_OR_LINK_TO_DIR; dentp->flags |= DIR_OR_LINK_TO_DIR;
++n; ++n;
} } while ((dp = readdir(dirp)));
//exit:
/* Should never be null */ /* Should never be null */
if (closedir(dirp) == -1) { if (closedir(dirp) == -1) {
dentfree(); dentfree();