Bläddra i källkod

Code refactor

master
Arun Prakash Jana 6 år sedan
förälder
incheckning
b2199db194
Ingen känd nyckel hittad för denna signaturen i databasen GPG-nyckel ID: A75979F35C080412
1 ändrade filer med 9 tillägg och 8 borttagningar
  1. +9
    -8
      src/nnn.c

+ 9
- 8
src/nnn.c Visa fil

@@ -3328,6 +3328,7 @@ static void redraw(char *path)
if (ndents) { if (ndents) {
char sort[] = "\0 "; char sort[] = "\0 ";
char selmode[] = "\0 "; char selmode[] = "\0 ";
pEntry pent = &dents[cur];


if (cfg.selmode) if (cfg.selmode)
selmode[0] = 'Y'; selmode[0] = 'Y';
@@ -3340,11 +3341,11 @@ static void redraw(char *path)
sort[0] = 'E'; sort[0] = 'E';


/* Get the file extension for regular files */ /* Get the file extension for regular files */
if (S_ISREG(dents[cur].mode)) {
i = (int)strlen(dents[cur].name);
ptr = xmemrchr((uchar *)dents[cur].name, '.', i);
if (S_ISREG(pent->mode)) {
i = (int)strlen(pent->name);
ptr = xmemrchr((uchar *)pent->name, '.', i);
if (ptr) if (ptr)
attrs = ptr - dents[cur].name; /* attrs used as tmp var */
attrs = ptr - pent->name; /* attrs used as tmp var */
if (!ptr || (i - attrs) > 5 || (i - attrs) < 2) if (!ptr || (i - attrs) > 5 || (i - attrs) < 2)
ptr = "\b"; ptr = "\b";
} else } else
@@ -3353,20 +3354,20 @@ static void redraw(char *path)
/* We need to show filename as it may be truncated in directory listing */ /* We need to show filename as it may be truncated in directory listing */
if (!cfg.showdetail && !cfg.blkorder) { /* light mode */ if (!cfg.showdetail && !cfg.blkorder) { /* light mode */
/* Timestamp */ /* Timestamp */
strftime(buf, 18, "%F %R", localtime(&dents[cur].t));
strftime(buf, 18, "%F %R", localtime(&pent->t));


mvprintw(lastln, 0, "%d/%d (%d) %s%s%s %s %s\n", mvprintw(lastln, 0, "%d/%d (%d) %s%s%s %s %s\n",
cur + 1, ndents, nselected, selmode, sort, buf, cur + 1, ndents, nselected, selmode, sort, buf,
get_lsperms(dents[cur].mode), ptr);
get_lsperms(pent->mode), ptr);
} else if (!cfg.blkorder) { /* detail mode */ } else if (!cfg.blkorder) { /* detail mode */
/* Get the unescaped file name */ /* Get the unescaped file name */
base = unescape(dents[cur].name, NAME_MAX, NULL);
base = unescape(pent->name, NAME_MAX, NULL);


mvprintw(lastln, 0, "%d/%d (%d) %s%s%s [%s]\n", mvprintw(lastln, 0, "%d/%d (%d) %s%s%s [%s]\n",
cur + 1, ndents, nselected, selmode, sort, ptr, base); cur + 1, ndents, nselected, selmode, sort, ptr, base);
} else { /* du mode */ } else { /* du mode */
/* Get the unescaped file name */ /* Get the unescaped file name */
base = unescape(dents[cur].name, NAME_MAX, NULL);
base = unescape(pent->name, NAME_MAX, NULL);


xstrlcpy(buf, coolsize(dir_blocks << BLK_SHIFT), 12); xstrlcpy(buf, coolsize(dir_blocks << BLK_SHIFT), 12);
c = cfg.apparentsz ? 'a' : 'd'; c = cfg.apparentsz ? 'a' : 'd';


Laddar…
Avbryt
Spara