From ab561b86fb4b1715ae6f65483d99833f97031fb3 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Fri, 1 Dec 2023 09:16:29 -0500 Subject: libuv: win: honor NoDefaultCurrentDirectoryInExePath env var Backport commit 5e302730cd (win: honor NoDefaultCurrentDirectoryInExePath env var, 2023-12-01) from libuv PR 4238. --- Utilities/cmlibuv/src/win/process.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Utilities/cmlibuv/src/win/process.c b/Utilities/cmlibuv/src/win/process.c index 172b80b..02b6c26 100644 --- a/Utilities/cmlibuv/src/win/process.c +++ b/Utilities/cmlibuv/src/win/process.c @@ -391,10 +391,12 @@ static WCHAR* search_path(const WCHAR *file, } else { dir_end = path; - /* 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); + if (NeedCurrentDirectoryForExePathW(L"")) { + /* 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); + } while (result == NULL) { if (dir_end == NULL || *dir_end == L'\0') { -- cgit v0.12