From a6c58267d4f62a23f785f3fabab1b32646b03116 Mon Sep 17 00:00:00 2001 From: Chihiro Ito Date: Tue, 13 May 2025 10:10:25 +0900 Subject: [PATCH] 8356820: fixpath should allow + in paths on Windows --- make/scripts/fixpath.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make/scripts/fixpath.sh b/make/scripts/fixpath.sh index 8eaf57d18f380..6a524df4c680b 100644 --- a/make/scripts/fixpath.sh +++ b/make/scripts/fixpath.sh @@ -157,12 +157,12 @@ function import_path() { if [[ $? -eq 0 && -e "$unixpath" ]]; then if [[ ! "$winpath" =~ ^"$ENVROOT"\\.*$ ]] ; then # If it is not in envroot, it's a generic windows path - if [[ ! $winpath =~ ^[-_.:~\\a-zA-Z0-9]*$ ]] ; then + if [[ ! $winpath =~ ^[-_.:~+\\a-zA-Z0-9]*$ ]] ; then # Path has forbidden characters, rewrite as short name # This monster of a command uses the %~s support from cmd.exe to # reliably convert to short paths on all winenvs. shortpath="$($CMD /q /c for %I in \( "$winpath" \) do echo %~sI 2>/dev/null | tr -d \\n\\r)" - if [[ ! $shortpath =~ ^[-_.:~\\a-zA-Z0-9]*$ ]] ; then + if [[ ! $shortpath =~ ^[-_.:~+\\a-zA-Z0-9]*$ ]] ; then if [[ $QUIET != true ]]; then echo fixpath: failure: Path "'"$path"'" could not be converted to short path >&2 fi