Skip to content

Commit ca9d38c

Browse files
committed
Revert "Properly escape paths to executables. Fixes #18632."
This reverts commit bec2ee7. Conflicts: configure Caused distcheck failures and #18771
1 parent a30b72b commit ca9d38c

File tree

1 file changed

+3
-20
lines changed

1 file changed

+3
-20
lines changed

configure

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -76,24 +76,6 @@ putvar() {
7676
printf "%-20s := %s\n" $1 "$T" >>config.tmp
7777
}
7878

79-
putpathvar() {
80-
local T
81-
eval T=\$$1
82-
eval TLEN=\${#$1}
83-
if [ $TLEN -gt 35 ]
84-
then
85-
printf "configure: %-20s := %.35s ...\n" $1 "$T"
86-
else
87-
printf "configure: %-20s := %s %s\n" $1 "$T" "$2"
88-
fi
89-
if [ -z "$T" ]
90-
then
91-
printf "%-20s := \n" $1 >>config.tmp
92-
else
93-
printf "%-20s := \"%s\"\n" $1 "$T" >>config.tmp
94-
fi
95-
}
96-
9779
probe() {
9880
local V=$1
9981
shift
@@ -119,7 +101,7 @@ probe() {
119101
fi
120102
done
121103
eval $V=\$T
122-
putpathvar $V "$VER"
104+
putvar $V "$VER"
123105
}
124106

125107
probe_need() {
@@ -1348,7 +1330,8 @@ do
13481330
done
13491331

13501332
# Munge any paths that appear in config.mk back to posix-y
1351-
perl -i.bak -p -e 's@ ([a-zA-Z]):[/\\]@ /\1/@go;' config.tmp
1333+
perl -i.bak -p -e 's@ ([a-zA-Z]):[/\\]@ /\1/@go;' \
1334+
-e 's@\\@/@go;' config.tmp
13521335
rm -f config.tmp.bak
13531336

13541337
msg

0 commit comments

Comments
 (0)