Properly escape paths to executables. Fixes #18632.
This commit is contained in:
parent
5c1fd5f8b7
commit
bec2ee77f7
|
@ -76,6 +76,19 @@ putvar() {
|
||||||
printf "%-20s := %s\n" $1 "$T" >>config.tmp
|
printf "%-20s := %s\n" $1 "$T" >>config.tmp
|
||||||
}
|
}
|
||||||
|
|
||||||
|
putpathvar() {
|
||||||
|
local T
|
||||||
|
eval T=\$$1
|
||||||
|
eval TLEN=\${#$1}
|
||||||
|
if [ $TLEN -gt 35 ]
|
||||||
|
then
|
||||||
|
printf "configure: %-20s := %.35s ...\n" $1 "$T"
|
||||||
|
else
|
||||||
|
printf "configure: %-20s := %s %s\n" $1 "$T" "$2"
|
||||||
|
fi
|
||||||
|
printf "%-20s := %q\n" $1 "$T" >>config.tmp
|
||||||
|
}
|
||||||
|
|
||||||
probe() {
|
probe() {
|
||||||
local V=$1
|
local V=$1
|
||||||
shift
|
shift
|
||||||
|
@ -101,7 +114,7 @@ probe() {
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
eval $V=\$T
|
eval $V=\$T
|
||||||
putvar $V "$VER"
|
putpathvar $V "$VER"
|
||||||
}
|
}
|
||||||
|
|
||||||
probe_need() {
|
probe_need() {
|
||||||
|
@ -1330,8 +1343,7 @@ do
|
||||||
done
|
done
|
||||||
|
|
||||||
# Munge any paths that appear in config.mk back to posix-y
|
# Munge any paths that appear in config.mk back to posix-y
|
||||||
perl -i.bak -p -e 's@ ([a-zA-Z]):[/\\]@ /\1/@go;' \
|
perl -i.bak -p -e 's@ ([a-zA-Z]):[/\\]@ /\1/@go;' config.tmp
|
||||||
-e 's@\\@/@go;' config.tmp
|
|
||||||
rm -f config.tmp.bak
|
rm -f config.tmp.bak
|
||||||
|
|
||||||
msg
|
msg
|
||||||
|
|
Loading…
Reference in New Issue