Browse Source

Split out default filter initialization

master
sin 8 years ago
parent
commit
45e6fafc47
1 changed files with 8 additions and 6 deletions
  1. +8
    -6
      noice.c

+ 8
- 6
noice.c View File

@@ -238,6 +238,12 @@ setfilter(regex_t *regex, char *filter)
return r; return r;
} }


void
initfilter(int dot, char **ifilter)
{
*ifilter = dot ? "." : "^[^.]";
}

int int
visible(regex_t *regex, char *file) visible(regex_t *regex, char *file)
{ {
@@ -734,7 +740,7 @@ nochange:
goto begin; goto begin;
case SEL_TOGGLEDOT: case SEL_TOGGLEDOT:
showhidden ^= 1; showhidden ^= 1;
ifilter = showhidden ? "." : "^[^.]";
initfilter(showhidden, &ifilter);
strlcpy(fltr, ifilter, sizeof(fltr)); strlcpy(fltr, ifilter, sizeof(fltr));
goto begin; goto begin;
case SEL_MTIME: case SEL_MTIME:
@@ -795,11 +801,7 @@ main(int argc, char *argv[])


if (getuid() == 0) if (getuid() == 0)
showhidden = 1; showhidden = 1;

if (showhidden)
ifilter = ".";
else
ifilter = "^[^.]";
initfilter(showhidden, &ifilter);


if (argv[1] != NULL) { if (argv[1] != NULL) {
ipath = argv[1]; ipath = argv[1];


Loading…
Cancel
Save