Merge branch '386-libstd-bugs-in-std-append_path-and-std-prepend_path' into '1.1.22'

Resolve "libstd: bugs in std::append_path() and std::prepend_path()" See merge request Pmodules/src!412
2026-06-28 02:19:39 +02:00 · 2025-02-04 16:12:24 +01:00
parent b7f56a408d a3ee63cf88
commit e0841bce39
1 changed files with 3 additions and 1 deletions
@@ -133,6 +133,7 @@ std::append_path () {
 		[[ "${path}" == @(|*:)${dir}@(|:*) ]] && continue
 		dirs+="${dir}:"
 	done
+	[[ -n "${dirs}" ]] || return 0

 	# assemble new path
 	dirs="${dirs%:}"		# remove leading ':'
@@ -156,12 +157,13 @@ std::prepend_path () {
 		[[ "${path}" == @(|*:)${dir}@(|:*) ]] && continue
 		dirs+="${dir}:"
 	done
+	[[ -n "${dirs}" ]] || return 0

 	# assemble new path
 	dirs="${dirs%:}"		# remove leading ':'
        if [[ -z ${path} ]]; then
                path="${dirs}"
-        else
+	else
 		path="${dirs}:${path}"
        fi
 }