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

Code refactor

Browse source
This commit is contained in:
Arun Prakash Jana 2019-05-09 07:34:10 +05:30
parent 30aaa12e6f
commit c8e54ce4e2
No known key found for this signature in database
GPG key ID: A75979F35C080412
2 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -18,7 +18,7 @@ else
LDLIBS_CURSES ?= -lncurses LDLIBS_CURSES ?= -lncurses
endif endif
CFLAGS += -Wall -Wextra -Wno-unused-parameter CFLAGS += -Wall -Wextra -Wno-unused-parameter -Wno-format-truncation
CFLAGS += $(CFLAGS_OPTIMIZATION) CFLAGS += $(CFLAGS_OPTIMIZATION)
CFLAGS += $(CFLAGS_CURSES) CFLAGS += $(CFLAGS_CURSES)

28
src/nnn.c
View file

@ -2017,8 +2017,8 @@ static char *coolsize(off_t size)
{ {
static const char * const U = "BKMGTPEZY"; static const char * const U = "BKMGTPEZY";
static char size_buf[12]; /* Buffer to hold human readable size */ static char size_buf[12]; /* Buffer to hold human readable size */
static off_t rem; off_t rem;
static int i; int i;
rem = i = 0; rem = i = 0;
@ -2065,19 +2065,21 @@ static char *coolsize(off_t size)
} }
if (i > 0 && i < 6) if (i > 0 && i < 6)
snprintf(size_buf, 12, "%lu.%0*lu%c", (ulong)size, i, (ulong)rem, U[i]); snprintf(size_buf, 12, "%lu.%0*lu%c", size, i, rem, U[i]);
else else
snprintf(size_buf, 12, "%lu%c", (ulong)size, U[i]); snprintf(size_buf, 12, "%lu%c", size, U[i]);
return size_buf; return size_buf;
} }
static char *get_file_sym(mode_t mode) static void printent(const struct entry *ent, int sel, uint namecols)
{ {
static char ind[2]; const char *pname = unescape(ent->name, namecols);
const char cp = (ent->flags & FILE_COPIED) ? '+' : ' ';
char ind[2];
mode_t mode = ent->mode;
ind[0] = '\0'; ind[0] = ind[1] = '\0';
ind[1] = '\0';
switch (mode & S_IFMT) { switch (mode & S_IFMT) {
case S_IFREG: case S_IFREG:
@ -2104,18 +2106,10 @@ static char *get_file_sym(mode_t mode)
break; break;
} }
return ind;
}
static void printent(const struct entry *ent, int sel, uint namecols)
{
const char *pname = unescape(ent->name, namecols);
const char cp = (ent->flags & FILE_COPIED) ? '+' : ' ';
/* Directories are always shown on top */ /* Directories are always shown on top */
resetdircolor(ent->flags); resetdircolor(ent->flags);
printw("%s%c%s%s\n", CURSYM(sel), cp, pname, get_file_sym(ent->mode)); printw("%s%c%s%s\n", CURSYM(sel), cp, pname, ind);
} }
static void printent_long(const struct entry *ent, int sel, uint namecols) static void printent_long(const struct entry *ent, int sel, uint namecols)