Skip to content

Commit 2f7c65e

Browse files
committed
8303427: Fixpath confused if unix root contains "/jdk"
Reviewed-by: mikael
1 parent e9e0c56 commit 2f7c65e

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

make/scripts/fixpath.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,9 @@ function convert_path() {
326326
suffix="${BASH_REMATCH[6]}"
327327
328328
# We only believe this is a path if the first part is an existing directory
329-
if [[ -d "/$firstdir" ]]; then
329+
# and the prefix is not a subdirectory in the current working directory. Remove
330+
# any part leading up to a : or = in the prefix before checking.
331+
if [[ -d "/$firstdir" && ! -d "${prefix##*:}" && ! -d "${prefix##*=}" ]]; then
330332
if [[ $ENVROOT == "" ]]; then
331333
if [[ $QUIET != true ]]; then
332334
echo fixpath: failure: Path "'"$pathmatch"'" cannot be converted to Windows path >&2

0 commit comments

Comments
 (0)