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

Minor changes

Browse source
This commit is contained in:
Arun Prakash Jana 2018-11-09 20:07:47 +05:30
parent f5e36b9e24
commit 17f54456b1
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
nnn.c
View file

@ -922,9 +922,9 @@ static int setfilter(regex_t *regex, char *filter)
return r; return r;
} }
static void initfilter(int dot, char *hfilter) static void initfilter(int dot, char *hfltr)
{ {
dot ? (hfilter[0] = '.', hfilter[1] = '\0') : xstrlcpy(hfilter, "^[^.]", DOT_FILTER_LEN); dot ? (hfltr[0] = '.', hfltr[1] = '\0') : xstrlcpy(hfltr, "^[^.]", DOT_FILTER_LEN);
} }
static int visible(regex_t *regex, char *file) static int visible(regex_t *regex, char *file)
@ -1184,7 +1184,7 @@ static int filterentries(char *path)
/* /*
* redraw() should be above the auto-select optimization, for * redraw() should be above the auto-select optimization, for
* the case where there's an issue with dir auto-select, say, * the case where there's an issue with dir auto-select, say,
* due to a permission problem. The transition is jumpy in * due to a permission problem. The transition is _jumpy_ in
* case of such an error. However, we optimize for successful * case of such an error. However, we optimize for successful
* cases where the dir has permissions. This skips a redraw(). * cases where the dir has permissions. This skips a redraw().
*/ */
@ -2333,7 +2333,7 @@ static void redraw(char *path)
mode_changed = FALSE; mode_changed = FALSE;
nlines = MIN(LINES - 4, ndents); nlines = MIN(LINES - 4, ndents);
/* Clean screen */ /* Clear screen */
erase(); erase();
if (cfg.copymode) if (cfg.copymode)
if (g_crc != crc8fast((uchar *)dents, ndents * sizeof(struct entry))) { if (g_crc != crc8fast((uchar *)dents, ndents * sizeof(struct entry))) {
@ -2473,7 +2473,7 @@ static void browse(char *ipath)
{ {
static char newpath[PATH_MAX] __attribute__ ((aligned)); static char newpath[PATH_MAX] __attribute__ ((aligned));
static char mark[PATH_MAX] __attribute__ ((aligned)); static char mark[PATH_MAX] __attribute__ ((aligned));
char *path, *lastdir, *lastname, *hfilter; char *path, *lastdir, *lastname, *hfltr;
char *dir, *tmp, *run = NULL, *env = NULL; char *dir, *tmp, *run = NULL, *env = NULL;
struct stat sb; struct stat sb;
int r, fd, presel, ncp = 0, copystartid = 0, copyendid = 0; int r, fd, presel, ncp = 0, copystartid = 0, copyendid = 0;
@ -2489,7 +2489,7 @@ static void browse(char *ipath)
lastname = g_ctx[0].c_name; /* last visited filename */ lastname = g_ctx[0].c_name; /* last visited filename */
g_ctx[0].c_cfg = cfg; /* current configuration */ g_ctx[0].c_cfg = cfg; /* current configuration */
initfilter(cfg.showhidden, g_ctx[0].c_fltr); /* Show hidden filter */ initfilter(cfg.showhidden, g_ctx[0].c_fltr); /* Show hidden filter */
hfilter = g_ctx[0].c_fltr; hfltr = g_ctx[0].c_fltr;
if (cfg.filtermode) if (cfg.filtermode)
presel = FILTER; presel = FILTER;
@ -2524,7 +2524,7 @@ begin:
} }
#endif #endif
if (populate(path, lastname, hfilter) == -1) { if (populate(path, lastname, hfltr) == -1) {
printwarn(); printwarn();
goto nochange; goto nochange;
} }
@ -2781,7 +2781,7 @@ nochange:
g_ctx[r].c_last[0] = '\0'; g_ctx[r].c_last[0] = '\0';
xstrlcpy(g_ctx[r].c_name, dents[cur].name, NAME_MAX + 1); xstrlcpy(g_ctx[r].c_name, dents[cur].name, NAME_MAX + 1);
g_ctx[r].c_cfg = cfg; g_ctx[r].c_cfg = cfg;
xstrlcpy(g_ctx[r].c_fltr, hfilter, DOT_FILTER_LEN); xstrlcpy(g_ctx[r].c_fltr, hfltr, DOT_FILTER_LEN);
} }
/* Reset the pointers */ /* Reset the pointers */
@ -2789,7 +2789,7 @@ nochange:
ipath = g_ctx[r].c_init; ipath = g_ctx[r].c_init;
lastdir = g_ctx[r].c_last; lastdir = g_ctx[r].c_last;
lastname = g_ctx[r].c_name; lastname = g_ctx[r].c_name;
hfilter = g_ctx[r].c_fltr; hfltr = g_ctx[r].c_fltr;
cfg.curctx = r; cfg.curctx = r;
if (cfg.filtermode) if (cfg.filtermode)
@ -2850,7 +2850,7 @@ nochange:
goto nochange; goto nochange;
case SEL_TOGGLEDOT: case SEL_TOGGLEDOT:
cfg.showhidden ^= 1; cfg.showhidden ^= 1;
initfilter(cfg.showhidden, hfilter); initfilter(cfg.showhidden, hfltr);
/* Save current */ /* Save current */
if (ndents) if (ndents)
copycurname(); copycurname();
@ -3311,7 +3311,7 @@ nochange:
lastdir = g_ctx[r].c_last; lastdir = g_ctx[r].c_last;
lastname = g_ctx[r].c_name; lastname = g_ctx[r].c_name;
cfg = g_ctx[r].c_cfg; cfg = g_ctx[r].c_cfg;
hfilter = g_ctx[r].c_fltr; hfltr = g_ctx[r].c_fltr;
cfg.curctx = r; cfg.curctx = r;
if (cfg.filtermode) if (cfg.filtermode)