summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2023-06-07 10:42:07 +0200
committerUlrich Müller <ulm@gentoo.org>2023-06-07 10:56:25 +0200
commit610b01ff117232fde9068a9e97e7355d6e53f2e4 (patch)
tree6248d30baf0901f425724a44b5c6a0d412590df3
parentmate-base/mate-control-center: Stabilize 1.26.0-r2 amd64, #907979 (diff)
downloadgentoo-610b01ff.tar.gz
gentoo-610b01ff.tar.bz2
gentoo-610b01ff.zip
eapi8-dosym.eclass: Fix another corner case of strange input
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
-rw-r--r--eclass/eapi8-dosym.eclass4
-rwxr-xr-xeclass/tests/eapi8-dosym.sh1
2 files changed, 3 insertions, 2 deletions
diff --git a/eclass/eapi8-dosym.eclass b/eclass/eapi8-dosym.eclass
index e139b74cfea0..866c98c78d91 100644
--- a/eclass/eapi8-dosym.eclass
+++ b/eclass/eapi8-dosym.eclass
@@ -31,7 +31,7 @@ esac
_dosym8_canonicalize() {
local path slash i prev out IFS=/
- read -r -d '' -a path < <(echo -n "$1")
+ read -r -d '' -a path < <(printf '%s\0' "$1")
[[ $1 == /* ]] && slash=/
while true; do
@@ -56,7 +56,7 @@ _dosym8_canonicalize() {
done
out="${slash}${path[*]}"
- echo "${out:-.}"
+ printf "%s\n" "${out:-.}"
}
# @FUNCTION: dosym8
diff --git a/eclass/tests/eapi8-dosym.sh b/eclass/tests/eapi8-dosym.sh
index cae66e3bb2ee..a0f8961d4d96 100755
--- a/eclass/tests/eapi8-dosym.sh
+++ b/eclass/tests/eapi8-dosym.sh
@@ -54,6 +54,7 @@ teq foo _dosym8_canonicalize foo/.
teq ../foo _dosym8_canonicalize ../foo
teq ../baz _dosym8_canonicalize foo/bar/../../../baz
teq '*' _dosym8_canonicalize '*'
+teq '-e' _dosym8_canonicalize '-e'
for f in ref_dosym_r "dosym8 -r"; do
teq ../../bin/foo ${f} /bin/foo /usr/bin/foo