mirror of
https://github.com/neovim/neovim.git
synced 2025-09-30 06:58:35 +00:00
win: libuv_process_spawn(): special-case cmd.exe
Disable CommandLineToArgvW-standard quoting for cmd.exe. libuv assumes spawned processes follow the convention expected by CommandLineToArgvW(). But cmd.exe is non-conformant, so for cmd.exe: - With system([]), the caller has full control (and responsibility) to quote arguments correctly. - With system(''), shell* options are used. libuv quoting is disabled if argv[0] is: - cmd.exe - cmd - $COMSPEC resolving to a path with filename cmd.exe Closes #6329 References #6387
This commit is contained in:

committed by
Justin M. Keyes

parent
799443c994
commit
f3cc843755
@@ -8,6 +8,8 @@
|
||||
#include "nvim/event/process.h"
|
||||
#include "nvim/event/libuv_process.h"
|
||||
#include "nvim/log.h"
|
||||
#include "nvim/path.h"
|
||||
#include "nvim/os/os.h"
|
||||
|
||||
#ifdef INCLUDE_GENERATED_DECLARATIONS
|
||||
# include "event/libuv_process.c.generated.h"
|
||||
@@ -24,6 +26,26 @@ int libuv_process_spawn(LibuvProcess *uvproc)
|
||||
if (proc->detach) {
|
||||
uvproc->uvopts.flags |= UV_PROCESS_DETACHED;
|
||||
}
|
||||
#ifdef WIN32
|
||||
// libuv assumes spawned processes follow the convention from
|
||||
// CommandLineToArgvW(), cmd.exe does not. Disable quoting since it will
|
||||
// result in unexpected behaviour, the caller is left with the responsibility
|
||||
// to quote arguments accordingly. system('') has shell* options for this.
|
||||
//
|
||||
// Disable quoting for cmd, cmd.exe and $COMSPEC with a cmd.exe filename
|
||||
bool is_cmd = STRICMP(proc->argv[0], "cmd.exe") == 0
|
||||
|| STRICMP(proc->argv[0], "cmd") == 0;
|
||||
if (!is_cmd) {
|
||||
const char_u *comspec = (char_u *)os_getenv("COMSPEC");
|
||||
const char_u *comspecshell = path_tail((char_u *)proc->argv[0]);
|
||||
is_cmd = comspec != NULL && STRICMP(proc->argv[0], comspec) == 0
|
||||
&& STRICMP("cmd.exe", (char *)comspecshell) == 0;
|
||||
}
|
||||
|
||||
if (is_cmd) {
|
||||
uvproc->uvopts.flags |= UV_PROCESS_WINDOWS_VERBATIM_ARGUMENTS;
|
||||
}
|
||||
#endif
|
||||
uvproc->uvopts.exit_cb = exit_cb;
|
||||
uvproc->uvopts.cwd = proc->cwd;
|
||||
uvproc->uvopts.env = NULL;
|
||||
|
Reference in New Issue
Block a user