summaryrefslogtreecommitdiffstats
path: root/Utilities/cmlibuv
diff options
context:
space:
mode:
authorKyle Edwards <kyle.edwards@kitware.com>2023-11-29 18:05:43 (GMT)
committerKyle Edwards <kyle.edwards@kitware.com>2023-11-30 14:59:36 (GMT)
commitda9df7425ac0703baa1d1e619f281d5f3f148aa8 (patch)
treed836dcb8957d75e8379aa168ce39e21870317782 /Utilities/cmlibuv
parent1b82da7e151d83c38b7a48e4ab39c8ef0f853350 (diff)
downloadCMake-da9df7425ac0703baa1d1e619f281d5f3f148aa8.zip
CMake-da9df7425ac0703baa1d1e619f281d5f3f148aa8.tar.gz
CMake-da9df7425ac0703baa1d1e619f281d5f3f148aa8.tar.bz2
libuv: win/spawn: run executables with no file extension
Backport this commit from libuv PR 4241 to restore `execute_process()` support for running executables on Windows with no file extension. Fixes: #25450
Diffstat (limited to 'Utilities/cmlibuv')
-rw-r--r--Utilities/cmlibuv/src/win/process.c37
1 files changed, 12 insertions, 25 deletions
diff --git a/Utilities/cmlibuv/src/win/process.c b/Utilities/cmlibuv/src/win/process.c
index 14d7a69..172b80b 100644
--- a/Utilities/cmlibuv/src/win/process.c
+++ b/Utilities/cmlibuv/src/win/process.c
@@ -274,19 +274,16 @@ static WCHAR* path_search_walk_ext(const WCHAR *dir,
const WCHAR *name,
size_t name_len,
WCHAR *cwd,
- size_t cwd_len,
- int name_has_ext) {
+ size_t cwd_len) {
WCHAR* result;
- /* If the name itself has a nonempty extension, try this extension first */
- if (name_has_ext) {
- result = search_path_join_test(dir, dir_len,
- name, name_len,
- L"", 0,
- cwd, cwd_len);
- if (result != NULL) {
- return result;
- }
+ /* Try the name itself first */
+ result = search_path_join_test(dir, dir_len,
+ name, name_len,
+ L"", 0,
+ cwd, cwd_len);
+ if (result != NULL) {
+ return result;
}
/* Try .com extension */
@@ -329,8 +326,7 @@ 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 filename specified has *any* extension, search for the file with the
- * specified extension first.
+ * - Search for the file exactly as specified first.
*
* - If the literal filename is not found in a directory, try *appending*
* (not replacing) .com first and then .exe.
@@ -360,10 +356,8 @@ static WCHAR* search_path(const WCHAR *file,
int file_has_dir;
WCHAR* result = NULL;
WCHAR *file_name_start;
- WCHAR *dot;
const WCHAR *dir_start, *dir_end, *dir_path;
size_t dir_len;
- int name_has_ext;
size_t file_len = wcslen(file);
size_t cwd_len = wcslen(cwd);
@@ -387,17 +381,12 @@ static WCHAR* search_path(const WCHAR *file,
file_has_dir = file_name_start != file;
- /* Check if the filename includes an extension */
- dot = wcschr(file_name_start, L'.');
- name_has_ext = (dot != NULL && dot[1] != L'\0');
-
if (file_has_dir) {
/* 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,
- name_has_ext);
+ cwd, cwd_len);
} else {
dir_end = path;
@@ -405,8 +394,7 @@ static WCHAR* search_path(const WCHAR *file,
/* The file is really only a name; look in cwd first, then scan path */
result = path_search_walk_ext(L"", 0,
file, file_len,
- cwd, cwd_len,
- name_has_ext);
+ cwd, cwd_len);
while (result == NULL) {
if (dir_end == NULL || *dir_end == L'\0') {
@@ -454,8 +442,7 @@ static WCHAR* search_path(const WCHAR *file,
result = path_search_walk_ext(dir_path, dir_len,
file, file_len,
- cwd, cwd_len,
- name_has_ext);
+ cwd, cwd_len);
}
}