From 10d36d48a4d08206d7835ca4248bb3111b01ec2f Mon Sep 17 00:00:00 2001
From: Janosch Hoffmann <janosch.hoffmann@hotmail.de>
Date: Sun, 5 May 2019 10:24:52 +0200
Subject: [PATCH 1/4] filter: Don't ignore lines with leading whitespace

This patch is related to parsing the filter file.
The new code skips leading whitespaces before removing trailing
whitespaces and comments.
Without doing this, lines with leading whitespace are treated like empty
lines (i.e. they are ignored).
---
 src/filter.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/filter.c b/src/filter.c
index 3164191..6a932d1 100644
--- a/src/filter.c
+++ b/src/filter.c
@@ -78,6 +78,9 @@ void filter_init (void)
                  * comments.
                  */
                 s = buf;
+                /* skip leading whitespace */
+                while (*s && isspace ((unsigned char) *s))
+                        ++s;
                 while (*s) {
                         if (isspace ((unsigned char) *s))
                                 break;

From fffe45cae1c5ce86e16212fc31bd1f5694374067 Mon Sep 17 00:00:00 2001
From: Janosch Hoffmann <janosch.hoffmann@hotmail.de>
Date: Sun, 5 May 2019 16:46:16 +0200
Subject: [PATCH 2/4] filter: Remove redundant code

Skipping leading whitespace and removing trailing whitespace and
comments were swapped to avoid skipping the leading whitespace twice.
---
 src/filter.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/filter.c b/src/filter.c
index 6a932d1..dda4442 100644
--- a/src/filter.c
+++ b/src/filter.c
@@ -52,7 +52,7 @@ void filter_init (void)
         FILE *fd;
         struct filter_list *p;
         char buf[FILTER_BUFFER_LEN];
-        char *s;
+        char *s, *start;
         int cflags;
 
         if (fl || already_init) {
@@ -73,14 +73,16 @@ void filter_init (void)
                 cflags |= REG_ICASE;
 
         while (fgets (buf, FILTER_BUFFER_LEN, fd)) {
+                /* skip leading whitespace */
+                s = buf;
+                while (*s && isspace ((unsigned char) *s))
+                        s++;
+				start = s;
+
                 /*
                  * Remove any trailing white space and
                  * comments.
                  */
-                s = buf;
-                /* skip leading whitespace */
-                while (*s && isspace ((unsigned char) *s))
-                        ++s;
                 while (*s) {
                         if (isspace ((unsigned char) *s))
                                 break;
@@ -96,11 +98,7 @@ void filter_init (void)
                         ++s;
                 }
                 *s = '\0';
-
-                /* skip leading whitespace */
-                s = buf;
-                while (*s && isspace ((unsigned char) *s))
-                        s++;
+				s = start;
 
                 /* skip blank lines and comments */
                 if (*s == '\0')

From ba5c7efafb4826868cb1a866cca017b28bb37fca Mon Sep 17 00:00:00 2001
From: Janosch Hoffmann <janosch.hoffmann@hotmail.de>
Date: Sun, 5 May 2019 17:24:11 +0200
Subject: [PATCH 3/4] filter: Fix wrong indentation

I accidentally used tabs instead of spaces.
This commit fixes this.
---
 src/filter.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/filter.c b/src/filter.c
index dda4442..e18132e 100644
--- a/src/filter.c
+++ b/src/filter.c
@@ -77,7 +77,7 @@ void filter_init (void)
                 s = buf;
                 while (*s && isspace ((unsigned char) *s))
                         s++;
-				start = s;
+                start = s;
 
                 /*
                  * Remove any trailing white space and
@@ -98,7 +98,7 @@ void filter_init (void)
                         ++s;
                 }
                 *s = '\0';
-				s = start;
+                s = start;
 
                 /* skip blank lines and comments */
                 if (*s == '\0')

From 8da51573cc968d277076061fa70e8854b81f96e5 Mon Sep 17 00:00:00 2001
From: Janosch Hoffmann <janosch.hoffmann@hotmail.de>
Date: Mon, 6 May 2019 22:02:48 +0200
Subject: [PATCH 4/4] log.c: Remove obsolete comment

The comment for setup_logging was obsolete. The function
log_message() is called, fprintf() isn't.
This isn't a problem because of the send_stored_logs() function.
---
 src/log.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/log.c b/src/log.c
index f85d29d..93f6608 100644
--- a/src/log.c
+++ b/src/log.c
@@ -258,9 +258,6 @@ static void send_stored_logs (void)
 /**
  * Initialize the logging subsystem, based on the configuration.
  * Returns 0 upon success, -1 upon failure.
- *
- * This function uses fprintf() instead of log_message(), since
- * the logging is not yet set up...
  */
 int setup_logging (void)
 {