From: Daniel Harding <dharding@living180.net>
Date: Tue, 27 Oct 2020 06:27:01 +0000 (+0300)
Subject: ipsets: allow blank/commented lines with loadfile
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=e8f2d8f2e508a6cce7640a5dcbab9f6ef24b887b;p=project%2Ffirewall3.git

ipsets: allow blank/commented lines with loadfile

When loading ipset files using the loadfile option, skip blank lines and
lines that start with '#' (disregarding any leading whitespace).

Signed-off-by: Daniel Harding <dharding@living180.net>
---

diff --git a/ipsets.c b/ipsets.c
index 280845b..ba31e64 100644
--- a/ipsets.c
+++ b/ipsets.c
@@ -16,6 +16,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <ctype.h>
+
 #include "ipsets.h"
 
 
@@ -337,6 +339,7 @@ load_file(struct fw3_ipset *ipset)
 {
 	FILE *f;
 	char line[128];
+	char *p;
 
 	if (!ipset->loadfile)
 		return;
@@ -350,8 +353,13 @@ load_file(struct fw3_ipset *ipset)
 		return;
 	}
 
-	while (fgets(line, sizeof(line), f))
-		fw3_pr("add %s %s", ipset->name, line);
+	while (fgets(line, sizeof(line), f)) {
+		p = line;
+		while (isspace(*p))
+			p++;
+		if (*p && *p != '#')
+			fw3_pr("add %s %s", ipset->name, line);
+	}
 
 	fclose(f);
 }