]> Sergey Matveev's repositories - nnn.git/commitdiff
Split out default filter initialization
authorsin <sin@2f30.org>
Mon, 22 Aug 2016 13:10:14 +0000 (14:10 +0100)
committersin <sin@2f30.org>
Mon, 22 Aug 2016 13:10:14 +0000 (14:10 +0100)
noice.c

diff --git a/noice.c b/noice.c
index 0d5627dfea0b8cdf7aade9215cd63802c42218c2..2dc895daa3da97c9c67591d4118ff4d68ff31c2b 100644 (file)
--- 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];