aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar sin <sin@2f30.org>2016-08-22 14:10:14 +0100
committerGravatar sin <sin@2f30.org>2016-08-22 14:10:14 +0100
commit45e6fafc4708b10314be3399814c0f07d4ab8e1c (patch)
tree0b3cd9cf1fd86da0a3ef9f6cdc3f5b0c37667235
parentdd29e81df5e3aa917bb89d13282c3ba38f458a3f (diff)
downloadnnn-45e6fafc4708b10314be3399814c0f07d4ab8e1c.tar.gz
Split out default filter initialization
-rw-r--r--noice.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/noice.c b/noice.c
index 0d5627d..2dc895d 100644
--- a/noice.c
+++ b/noice.c
@@ -238,6 +238,12 @@ setfilter(regex_t *regex, char *filter)
return r;
}
+void
+initfilter(int dot, char **ifilter)
+{
+ *ifilter = dot ? "." : "^[^.]";
+}
+
int
visible(regex_t *regex, char *file)
{
@@ -734,7 +740,7 @@ nochange:
goto begin;
case SEL_TOGGLEDOT:
showhidden ^= 1;
- ifilter = showhidden ? "." : "^[^.]";
+ initfilter(showhidden, &ifilter);
strlcpy(fltr, ifilter, sizeof(fltr));
goto begin;
case SEL_MTIME:
@@ -795,11 +801,7 @@ main(int argc, char *argv[])
if (getuid() == 0)
showhidden = 1;
-
- if (showhidden)
- ifilter = ".";
- else
- ifilter = "^[^.]";
+ initfilter(showhidden, &ifilter);
if (argv[1] != NULL) {
ipath = argv[1];