mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-17 15:21:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

pty_process_win: avoid quoting for cmd.exe

Browse Source
This commit is contained in:
erw7
2017-04-14 22:35:56 +09:00
committed by Justin M. Keyes
parent d3a8c4f992
commit 8c1782b840
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/nvim/os/pty_process_win.c
View File

@@ -97,7 +97,8 @@ int pty_process_spawn(PtyProcess *ptyproc)
}
}
status = build_cmd_line(proc->argv, &cmd_line);
status = build_cmd_line(proc->argv, &cmd_line,
os_shell_is_cmdexe(proc->argv[0]));
if (status != 0) {
emsg = "Failed to convert cmd line form utf8 to utf16.";
goto cleanup;
@@ -258,7 +259,7 @@ static void pty_process_finish2(PtyProcess *ptyproc)
///
/// @returns zero on success, or error code of MultiByteToWideChar function.
///
static int build_cmd_line(char **argv, wchar_t **cmd_line)
static int build_cmd_line(char **argv, wchar_t **cmd_line, bool is_cmdexe)
FUNC_ATTR_NONNULL_ALL
{
size_t utf8_cmd_line_len = 0;
@@ -267,10 +268,14 @@ static int build_cmd_line(char **argv, wchar_t **cmd_line)
QUEUE_INIT(&args_q);
while (*argv) {
size_t buf_len = strlen(*argv) * 2 + 3;
size_t buf_len = is_cmdexe ? (strlen(*argv) + 1) : (strlen(*argv) * 2 + 3);
ArgNode *arg_node = xmalloc(sizeof(*arg_node));
arg_node->arg = xmalloc(buf_len);
quote_cmd_arg(arg_node->arg, buf_len, *argv);
if (is_cmdexe) {
xstrlcpy(arg_node->arg, *argv, buf_len);
} else {
quote_cmd_arg(arg_node->arg, buf_len, *argv);
}
utf8_cmd_line_len += strlen(arg_node->arg);
QUEUE_INIT(&arg_node->node);
QUEUE_INSERT_TAIL(&args_q, &arg_node->node);