From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jonatan Schlag <jonatan.schlag@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH v2 10/18] initscript functions: add readhash
Date: Sun, 16 Jun 2024 18:02:37 +0200
Message-ID: <20240616160245.18865-11-jonatan.schlag@ipfire.org>
In-Reply-To: <20240616160245.18865-1-jonatan.schlag@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1962755555066592128=="
List-Id: <development.lists.ipfire.org>

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

To avoid the usage of eval and to store the config in an key value
array, we introduce an new function. The tests only check if we
read the correct value to the correct variable.

One comment on the implementation as this has created some headache:

>>From https://www.gnu.org/software/bash/manual/bash.html#Bourne-Shell-Builtins

	"When used in a function, declare makes each name local, as with the local c=
ommand, unless the -g option is used."

So we need to use -g here

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
---
 src/initscripts/system/functions               | 15 +++++++++++++++
 tests/src/initscripts/system/functions/data/1  | 17 +++++++++++++++++
 tests/src/initscripts/system/functions/test.sh | 16 ++++++++++++++++
 3 files changed, 48 insertions(+)
 create mode 100644 tests/src/initscripts/system/functions/data/1
 create mode 100755 tests/src/initscripts/system/functions/test.sh

diff --git a/src/initscripts/system/functions b/src/initscripts/system/functi=
ons
index b610143ab..44ce999d3 100644
--- a/src/initscripts/system/functions
+++ b/src/initscripts/system/functions
@@ -891,3 +891,18 @@ volume_fs_type() {
=20
 	stat -f --format=3D"%T" ${1}
 }
+
+readhash() {
+	local array=3D"${1}"
+	local file=3D"${2}"
+
+	declare -A -g "${array}"
+
+	local line
+	while read -r line; do
+		local key=3D"${line%=3D*}"
+		local val=3D"${line#*=3D}"
+
+		printf -v "${array}[${key}]" "%s" "${val}"
+	done < "${file}"
+}
diff --git a/tests/src/initscripts/system/functions/data/1 b/tests/src/initsc=
ripts/system/functions/data/1
new file mode 100644
index 000000000..8aca9422b
--- /dev/null
+++ b/tests/src/initscripts/system/functions/data/1
@@ -0,0 +1,17 @@
+CONFIG_TYPE=3D3
+GREEN_DEV=3Dgreen0
+GREEN_MACADDR=3D00:c0:08:8a:a0:47
+GREEN_DRIVER=3Dr8175
+RED_DEV=3Dred0
+RED_MACADDR=3D00:c0:08:8a:a0:56
+RED_DRIVER=3Dr8283
+BLUE_DEV=3D'blue0 net0'
+BLUE_MACADDR=3Dbc:30:7d:58:6b:e3
+BLUE_DRIVER=3Drt2800
+RED_DHCP_HOSTNAME=3Dipfire
+RED_DHCP_FORCE_MTU=3D
+RED_ADDRESS=3D0.0.0.0
+RED_NETMASK=3D0.0.0.0
+RED_TYPE=3DPPPOE
+RED_NETADDRESS=3D0.0.0.0
+
diff --git a/tests/src/initscripts/system/functions/test.sh b/tests/src/inits=
cripts/system/functions/test.sh
new file mode 100755
index 000000000..dbb2d8a62
--- /dev/null
+++ b/tests/src/initscripts/system/functions/test.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/bash
+
+SCRIPT_PATH=3D"$(dirname "$(readlink -f "$0")")"
+
+ROOT=3D"$(readlink -f "${SCRIPT_PATH}/../../../../..")"
+
+. ${ROOT}/tests/lib.sh
+
+. ${ROOT}/src/initscripts/system/functions
+
+# read the date in
+readhash "CONFIG" "${SCRIPT_PATH}/data/1"
+
+# test if we read the correct data
+test_value_in_array "CONFIG" "RED_DHCP_HOSTNAME" "ipfire"
+test_value_in_array "CONFIG" "BLUE_MACADDR" "bc:30:7d:58:6b:e3"
--=20
2.39.2


--===============1962755555066592128==--