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

Combine multiple functions

Browse source
This commit is contained in:
Arun Prakash Jana 2021-04-06 21:59:21 +05:30
parent f27df77777
commit b3132d6398
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/nnn.c
View file

@ -3645,24 +3645,11 @@ static char get_detail_ind(const mode_t mode)
return '?'; return '?';
} }
static char get_name_ind(const struct entry *ent) static uchar_t get_color_pair_name_ind(const struct entry *ent, char *pind, bool detailed)
{
switch (ent->mode & S_IFMT) {
case S_IFREG: return (ent->mode & 0100) ? '*' : '\0';
case S_IFDIR: return '/';
case S_IFLNK: return (ent->flags & DIR_OR_LINK_TO_DIR) ? '/' : '@';
case S_IFSOCK: return '=';
case S_IFIFO: return '|';
case S_IFBLK: // fallthrough
case S_IFCHR: return '\0';
}
return '?';
}
static uchar_t get_color_pair(const struct entry *ent, bool detailed)
{ {
switch (ent->mode & S_IFMT) { switch (ent->mode & S_IFMT) {
case S_IFREG: case S_IFREG:
*pind = (ent->mode & 0100) ? '*' : '\0';
if (!ent->size) if (!ent->size)
return C_UND; return C_UND;
if (ent->flags & HARD_LINK) if (ent->flags & HARD_LINK)
@ -3670,23 +3657,36 @@ static uchar_t get_color_pair(const struct entry *ent, bool detailed)
if (ent->mode & 0100) if (ent->mode & 0100)
return C_EXE; return C_EXE;
return C_FIL; return C_FIL;
case S_IFDIR:
*pind = '/';
return (!g_state.oldcolor && g_state.dirctx) ? cfg.curctx + 1 : C_DIR;
case S_IFLNK: case S_IFLNK:
*pind = (ent->flags & DIR_OR_LINK_TO_DIR) ? '/' : '@';
if (!g_state.oldcolor || detailed) if (!g_state.oldcolor || detailed)
return (ent->flags & SYM_ORPHAN) ? C_ORP : C_LNK; return (ent->flags & SYM_ORPHAN) ? C_ORP : C_LNK;
return 0; return 0;
case S_IFDIR: return (!g_state.oldcolor && g_state.dirctx) ? cfg.curctx + 1 : C_DIR; case S_IFSOCK:
case S_IFSOCK: return C_SOC; *pind = '=';
case S_IFIFO: return C_PIP; return C_SOC;
case S_IFBLK: return C_BLK; case S_IFIFO:
case S_IFCHR: return C_CHR; *pind = '|';
return C_PIP;
case S_IFBLK:
*pind = '\0';
return C_BLK;
case S_IFCHR:
*pind = '\0';
return C_CHR;
} }
*pind = '?';
return C_UND; return C_UND;
} }
static void printent(const struct entry *ent, uint_t namecols, bool sel) static void printent(const struct entry *ent, uint_t namecols, bool sel)
{ {
uchar_t color_pair = get_color_pair(ent, (printptr == &printent_long)); char ind;
char ind = get_name_ind(ent); uchar_t color_pair = get_color_pair_name_ind(ent, &ind, (printptr == &printent_long));
int attrs = 0, entry_type = ent->mode & S_IFMT; int attrs = 0, entry_type = ent->mode & S_IFMT;
addch((ent->flags & FILE_SELECTED) ? '+' : ' '); addch((ent->flags & FILE_SELECTED) ? '+' : ' ');