diff options
author | Brad King <brad.king@kitware.com> | 2024-02-08 21:47:06 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2024-02-08 21:47:06 (GMT) |
commit | f02ac511504ec1a22e07c5c6c82bb60e07f40500 (patch) | |
tree | f147569f65f845c8a2d076a3a21a3049be181349 | |
parent | 58a271e60b53f6d2393f84bc3f56f087b3d7f5af (diff) | |
parent | a23da1559648995998343f3ae63076db736b55a5 (diff) | |
download | CMake-f02ac511504ec1a22e07c5c6c82bb60e07f40500.zip CMake-f02ac511504ec1a22e07c5c6c82bb60e07f40500.tar.gz CMake-f02ac511504ec1a22e07c5c6c82bb60e07f40500.tar.bz2 |
libuv: Revert "win/spawn: run executables with no file extension"
This reverts commit fc6231bee5 (libuv: win/spawn: run executables with
no file extension, 2023-12-04, v3.28.0~9^2) to make room for the
corresponding fix from upstream libuv 1.48.
Record this as a merge from the last-imported upstream libuv snapshot
branch so that future `git blame` points to the upstream for the
original code instead of this commit.
Issue: #25450
-rw-r--r-- | Utilities/cmlibuv/src/win/process.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Utilities/cmlibuv/src/win/process.c b/Utilities/cmlibuv/src/win/process.c index 7df3540..9d0ceba 100644 --- a/Utilities/cmlibuv/src/win/process.c +++ b/Utilities/cmlibuv/src/win/process.c @@ -329,8 +329,6 @@ static WCHAR* path_search_walk_ext(const WCHAR *dir, * - If there's really only a filename, check the current directory for file, * then search all path directories. * - * - If a full path is specified, search for the exact filename first. - * * - If filename specified has *any* extension, search for the file with the * specified extension first. * @@ -394,14 +392,12 @@ static WCHAR* search_path(const WCHAR *file, name_has_ext = (dot != NULL && dot[1] != L'\0'); if (file_has_dir) { - /* The file has a path inside, don't use path - * Try the exact filename first, and then try standard extensions - */ + /* The file has a path inside, don't use path */ result = path_search_walk_ext( file, file_name_start - file, file_name_start, file_len - (file_name_start - file), cwd, cwd_len, - 1); + name_has_ext); } else { dir_end = path; |