--- a/share/local-bsdtools/farray.sh	Thu Sep 12 00:28:41 2024 +0200
+++ b/share/local-bsdtools/farray.sh	Thu Sep 12 00:38:28 2024 +0200
@@ -354,7 +354,7 @@
         # Set value Escape properly: use $' ' and escape any
         # backslashes and single quotes.
         #
-        eval ${__farr_gvrname}_${__farr_len_1}="$(_farr_quote_for_eval_dsq "${__farr_newval}")"
+        eval ${__farr_gvrname}_${__farr_len_1}="$(_farr_quote_for_eval "${__farr_newval}")"
         # the implementation below line does not escape properly
         #   eval ${__farr_gvrname}_${__farr_len_1}="\"${__farr_value}\""
 
@@ -395,12 +395,12 @@
     # For proper quoting: see farray_append
     if [ \( ${__farr_index} -ge 1 \) -a \( ${__farr_index} -le ${__farr_len} \) ]; then
         # replace a value at an existing index
-        eval ${__farr_gvrname}_${__farr_index}="$(_farr_quote_for_eval_dsq "${__farr_value}")"
+        eval ${__farr_gvrname}_${__farr_index}="$(_farr_quote_for_eval "${__farr_value}")"
     else
         __farr_len_1=$((__farr_len + 1))
         if [ ${__farr_index} -eq ${__farr_len_1} ]; then
             # append value
-            eval ${__farr_gvrname}_${__farr_len_1}="$(_farr_quote_for_eval_dsq "${__farr_value}")"
+            eval ${__farr_gvrname}_${__farr_len_1}="$(_farr_quote_for_eval "${__farr_value}")"
             # and set new length
             eval ${__farr_gvrname}__=${__farr_len_1}
         else
@@ -512,7 +512,7 @@
     while [ ${__farr_idx} -lt ${__farr_len} ]; do
         # copy the following value to the current index
         eval __farr_value=\"\$\{${__farr_gvrname}_${__farr_idx_1}\}\"
-        eval ${__farr_gvrname}_${__farr_idx}="$(_farr_quote_for_eval_dsq "${__farr_value}")"
+        eval ${__farr_gvrname}_${__farr_idx}="$(_farr_quote_for_eval "${__farr_value}")"
         __farr_idx=$((__farr_idx + 1))
         __farr_idx_1=$((__farr_idx + 1))
     done
@@ -773,7 +773,7 @@
         if [ ${__farr_join_idx} -gt 1 ]; then
             printf "%s" " "
         fi
-        printf "%s" "$(_farr_quote_for_eval_dsq "${__farr_current_value}")"
+        printf "%s" "$(_farr_quote_for_eval "${__farr_current_value}")"
 	__farr_join_idx=$((__farr_join_idx + 1))
     done
 }
@@ -1137,7 +1137,7 @@
         if [ -n "${__farr_elkey}" ]; then
             eval __farr_elkey=\"\$\{${__farr_keyname}_${__farr_idx}\}\"
             if [ "${__farr_elkey}" = "${__farr_key}" ]; then
-                eval ${__farr_valname}_${__farr_idx}="$(_farr_quote_for_eval_dsq "${__farr_value}")"
+                eval ${__farr_valname}_${__farr_idx}="$(_farr_quote_for_eval "${__farr_value}")"
                 return 0
             fi
         else
@@ -1152,8 +1152,8 @@
     #
     __farr_len=${__farr_idx}
     #   ... the key/value pairs to storage
-    eval ${__farr_keyname}_${__farr_len}="$(_farr_quote_for_eval_dsq "${__farr_key}")"
-    eval ${__farr_valname}_${__farr_len}="$(_farr_quote_for_eval_dsq "${__farr_value}")"
+    eval ${__farr_keyname}_${__farr_len}="$(_farr_quote_for_eval "${__farr_key}")"
+    eval ${__farr_valname}_${__farr_len}="$(_farr_quote_for_eval "${__farr_value}")"
     #   ... the new length
     eval ${__farr_objname}__=${__farr_len}
     return 0
@@ -1567,11 +1567,11 @@
     farray_create TEST
     farray_set TEST 1 "VAL-1"     # appends here
     farray_set TEST 2 "VAL-2"     # appends here
-    farray_set TEST 1 "VAL-1-1"   # replaces at index 1
+    farray_set TEST 1 "VAL-1 1"   # replaces at index 1
     farray_length _var TEST
     [ ${_var} -eq 2 ] || echo "LENGTH != 2 (ERROR)"
     farray_get _var TEST 1
-    [ "${_var}" = "VAL-1-1" ] || echo "unexpected value (ERROR)"
+    [ "${_var}" = "VAL-1 1" ] || echo "unexpected value (ERROR)"
     farray_get _var TEST 2
     [ "${_var}" = "VAL-2" ] || echo "unexpected value (ERROR)"
     farray_destroy TEST
@@ -1587,7 +1587,7 @@
     falist_set LIST K1 V1
     falist_set LIST K2 V2
     falist_debug LIST
-    falist_set LIST K2 V2-2
+    falist_set LIST K2 "V2 2"
     falist_set LIST K3 $'" 111222333" \\\'444555 '    # '
     falist_debug LIST
     if ! falist_contains LIST K1; then
@@ -1598,7 +1598,7 @@
     fi
     falist_debug LIST
     falist_get _var LIST K2
-    [ "$_var" = "V2-2" ] || echo "alist element not found (ERROR)"
+    [ "$_var" = "V2 2" ] || echo "alist element not found (ERROR)"
     if ! falist_tryget _var LIST K1; then
         echo "NOT FOUND (ERROR)"
     fi