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

Drop / indicator for directories

Browse source
This commit is contained in:
Arun Prakash Jana 2020-02-26 22:19:48 +05:30
parent dd2be32382
commit 987cc9b4b3
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/nnn.c
View file

@ -3102,7 +3102,7 @@ static char get_ind(mode_t mode, bool perms)
return '*'; return '*';
return '\0'; return '\0';
case S_IFDIR: case S_IFDIR:
return perms ? 'd' : '/'; return perms ? 'd' : '\0';
case S_IFLNK: case S_IFLNK:
return perms ? 'l' : '@'; return perms ? 'l' : '@';
case S_IFSOCK: case S_IFSOCK:
@ -3187,10 +3187,6 @@ static void printent_long(const struct entry *ent, uint namecols, bool sel)
permbuf[3] = '0' + ((ent->mode >> 3) & 7); permbuf[3] = '0' + ((ent->mode >> 3) & 7);
permbuf[4] = '0' + (ent->mode & 7); permbuf[4] = '0' + (ent->mode & 7);
/* Add a column if no indicator is needed */
if (S_ISREG(ent->mode) && !(ent->mode & 0100))
++namecols;
/* Directories are always shown on top */ /* Directories are always shown on top */
resetdircolor(ent->flags); resetdircolor(ent->flags);
@ -3206,11 +3202,14 @@ static void printent_long(const struct entry *ent, uint namecols, bool sel)
case S_IFREG: case S_IFREG:
ind1 = (ent->flags & HARD_LINK) ? '>' : ' '; ind1 = (ent->flags & HARD_LINK) ? '>' : ' ';
if (ent->mode & 0100) if (ent->mode & 0100)
ind2 = '*'; // fallthrough ind2 = '*';
else /* Add a column if no indicator is needed */
++namecols;
// fallthrough
case S_IFDIR: case S_IFDIR:
if (!ind1) { if (!ind1) {
ind1 = ' '; ind1 = ' ';
ind2 = '/'; ++namecols;
} }
size = coolsize(cfg.blkorder ? ent->blocks << blk_shift : ent->size); size = coolsize(cfg.blkorder ? ent->blocks << blk_shift : ent->size);