commit 26861532a24d32405546d9734936c0f684db9b33
parent 005c94d1ba7b2f5196843f54e4c8001e97459127
Author: Arun Prakash Jana <engineerarun@gmail.com>
Date: Wed, 27 Feb 2019 19:27:35 +0530
Simpler symlink to dir check
Diffstat:
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/nnn.c b/src/nnn.c
@@ -2676,19 +2676,15 @@ static int dentfill(char *path, struct entry **dents)
}
/* Flag if this is a dir or symlink to a dir */
+ if (S_ISLNK(sb.st_mode)) {
+ sb.st_mode = 0;
+ fstatat(fd, namep, &sb, 0);
+ }
+
if (S_ISDIR(sb.st_mode))
dentp->flags |= DIR_OR_LINK_TO_DIR;
- else if (!S_ISLNK(sb.st_mode)) {
- if (dentp->flags & DIR_OR_LINK_TO_DIR)
- dentp->flags &= ~DIR_OR_LINK_TO_DIR;
- } else {
- if (!fstatat(fd, namep, &sb, 0)) {
- if (S_ISDIR(sb.st_mode))
- dentp->flags |= DIR_OR_LINK_TO_DIR;
- else
- dentp->flags &= ~DIR_OR_LINK_TO_DIR;
- }
- }
+ else if (dentp->flags & DIR_OR_LINK_TO_DIR)
+ dentp->flags &= ~DIR_OR_LINK_TO_DIR;
++n;
}