utils-cidr

commit: 8d6b780a60f462f0963651ced9bea72faddef15d
parent eca372ffe8f34f013a5dbddaf5485624cb62f2b5
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Sat, 18 Oct 2025 03:24:34 +0200

cidr2list: skip empty lines

Diffstat:
M
cidr2list.c
2
++
M
test.sh
6
++++--

2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/cidr2list.c b/cidr2list.c
@@ -126,6 +126,8 @@ main(void)
 
 		if(line[nread - 1] == '\n') line[--nread] = '\0';
 
+		if(nread == 0) continue;
+
 		struct inet4_cidr addr;
 		if(!str_inet4(line, (size_t)nread, &addr)) return 1;
 
diff --git a/test.sh b/test.sh
@@ -2,14 +2,14 @@
 # Copyright © 2025 Haelwenn (lanodan) Monnier <contact+utils-cidr@hacktivis.me>
 # SPDX-License-Identifier: MPL-2.0
 
-plans=9
+plans=10
 WD=$(dirname "$0")
 target="${WD}/cidr2list"
 . ./tap.sh
 set -e
 
 lines() {
-	echo "$@" | "$target" | wc -l | tr -d '\n'
+	printf '%s\n' "$@" | "$target" | wc -l | tr -d '\n'
 }
 
 t_cmd lines:/32 1 lines 192.168.0.42/32
@@ -28,3 +28,5 @@ t --input='192.168.0.43/31' 192.168.0.43/31 '192.168.0.42
 
 t --input=192.168.0.42 nocidr '192.168.0.42
 '
+
+t_cmd empty_lines 4 lines '' 192.168.0.42/31 '' 192.168.0.69/31 ''