From bdc9ddf8b5791c5019b7c7bb71188d12c39cb873 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Mon, 8 Nov 2021 11:59:21 +0100
Subject: [PATCH] std:split_fname(): changed arguments and leading slash
 handling

- a leading slash is now removed
- the filename is now passed as second argument, the number of
  parts is returned in an optional third argument
---
 Pmodules/libstd.bash | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/Pmodules/libstd.bash b/Pmodules/libstd.bash
index fedd0c4..f7bee90 100644
--- a/Pmodules/libstd.bash
+++ b/Pmodules/libstd.bash
@@ -135,14 +135,27 @@ std::replace_path () {
 #
 # split file name
 #
+# Args:
+#     $1  upvar
+#     $2  fname
+#     $3  opt upvar: number of components
+#
 std::split_fname() {
-        local -r savedIFS="${IFS}"
+	local parts="$1"
+	local  -r fname="$2"
+	if [[ "${fname:0:1}" == '/' ]]; then
+		local -r std__split_fname_tmp="${fname:1}"
+	else
+		local -r std__split_fname_tmp="${fname}"
+	fi
+
         IFS='/'
-        local std__split_fname_result__=( $(echo "${@: -1}") )
-        IFS=${savedIFS}
-        eval $1=\(\"\${std__split_fname_result__[@]}\"\)
+        local std__split_fname_result=( ${std__split_fname_tmp} )
+	unset IFS
+	std::upvar ${parts} "${std__split_fname_result[@]}"
 	if (( $# >= 3 )); then
-	        eval $2=${#std__split_fname_result__[@]}
+		# return number of parts
+	        std::upvar "$3" ${#std__split_fname_result[@]}
 	fi
 }