From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jonatan Schlag <jonatan.schlag@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 16/21] initscripts fkt: Ignore comments in readhash
Date: Mon, 20 May 2024 11:06:06 +0200
Message-ID: <20240520090611.10406-17-jonatan.schlag@ipfire.org>
In-Reply-To: <20240520090611.10406-1-jonatan.schlag@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6937039111837927317=="
List-Id: <development.lists.ipfire.org>

--===============6937039111837927317==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

As '#Another Comment' is a valid key we test this change by checking if
the comments do not end up as keys in our array.

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
---
 src/initscripts/system/functions               | 5 +++++
 tests/src/initscripts/system/functions/data/1  | 3 +++
 tests/src/initscripts/system/functions/test.sh | 6 ++++++
 3 files changed, 14 insertions(+)

diff --git a/src/initscripts/system/functions b/src/initscripts/system/functi=
ons
index 3f01be9e0..6107463fc 100644
--- a/src/initscripts/system/functions
+++ b/src/initscripts/system/functions
@@ -906,6 +906,11 @@ readhash() {
 			continue
 		fi
=20
+		# Skip Comments
+		if [[ ${line} =3D~ ^#.*$ ]]; then
+			continue
+		fi
+
 		local key=3D"${line%=3D*}"
 		local val=3D"${line#*=3D}"
=20
diff --git a/tests/src/initscripts/system/functions/data/1 b/tests/src/initsc=
ripts/system/functions/data/1
index 8aca9422b..c75620b6b 100644
--- a/tests/src/initscripts/system/functions/data/1
+++ b/tests/src/initscripts/system/functions/data/1
@@ -5,6 +5,7 @@ GREEN_DRIVER=3Dr8175
 RED_DEV=3Dred0
 RED_MACADDR=3D00:c0:08:8a:a0:56
 RED_DRIVER=3Dr8283
+# Another Comment
 BLUE_DEV=3D'blue0 net0'
 BLUE_MACADDR=3Dbc:30:7d:58:6b:e3
 BLUE_DRIVER=3Drt2800
@@ -15,3 +16,5 @@ RED_NETMASK=3D0.0.0.0
 RED_TYPE=3DPPPOE
 RED_NETADDRESS=3D0.0.0.0
=20
+# Comment for testing =20
+    # Comment for testing Comments with spaces before
diff --git a/tests/src/initscripts/system/functions/test.sh b/tests/src/inits=
cripts/system/functions/test.sh
index 8d644b8cd..f1348a9e8 100755
--- a/tests/src/initscripts/system/functions/test.sh
+++ b/tests/src/initscripts/system/functions/test.sh
@@ -15,5 +15,11 @@ readhash "CONFIG" "${SCRIPT_PATH}/data/1"
 test_that_key_in_arry_has_value "CONFIG" "RED_DHCP_HOSTNAME" "ipfire"
 test_that_key_in_arry_has_value "CONFIG" "BLUE_MACADDR" "bc:30:7d:58:6b:e3"
=20
+# Test that comments are skipped
+# apparently the way we read the file strips the whitespace, so the key does=
 not contain any whitespace either
+test_that_array_doesnt_have_key "CONFIG" "# Another Comment"
+test_that_array_doesnt_have_key "CONFIG" "# Comment for testing"
+test_that_array_doesnt_have_key "CONFIG" "# Comment for testing Comments wit=
h spaces before"
+
 test_that_output_is "${SCRIPT_PATH}/data/1_output_stdout" "1" readhash "CONF=
IG" "${SCRIPT_PATH}/data/1"
 test_that_output_is "${SCRIPT_PATH}/data/1_output_stderr" "2" readhash "CONF=
IG" "${SCRIPT_PATH}/data/1"
--=20
2.39.2


--===============6937039111837927317==--