aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.1.2115: MS-Windows: shell commands fail if &shell contains a space

Browse Source 
Problem:    MS-Windows: shell commands fail if &shell contains a space.
Solution:   Use quotes instead of escaping. (closes #4920)
This commit is contained in:
Bram Moolenaar
2019-10-05 12:09:32 +02:00
parent fd00c042af
commit 2efc44b3f0
6 changed files with 122 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/vimrun.c
View File

@@ -27,6 +27,8 @@
main(void)
{
const wchar_t *p;
wchar_t *cmd;
size_t cmdlen;
int retval;
int inquote = 0;
int silent = 0;
@@ -63,16 +65,36 @@ main(void)
++p;
}
/* Print the command, including quotes and redirection. */
// Print the command, including quotes and redirection.
hstdout = GetStdHandle(STD_OUTPUT_HANDLE);
WriteConsoleW(hstdout, p, wcslen(p), &written, NULL);
WriteConsoleW(hstdout, L"\r\n", 2, &written, NULL);
// If the command starts and ends with double quotes,
// Enclose the command in parentheses.
cmd = NULL;
cmdlen = wcslen(p);
if (cmdlen >= 2 && p[0] == L'"' && p[cmdlen - 1] == L'"')
{
cmdlen += 3;
cmd = (wchar_t *)malloc(cmdlen * sizeof(wchar_t));
if (cmd == NULL)
{
perror("vimrun malloc(): ");
return -1;
}
_snwprintf(cmd, cmdlen, L"(%s)", p);
p = cmd;
}
/*
* Do it!
*/
retval = _wsystem(p);
if (cmd)
free(cmd);
if (retval == -1)
perror("vimrun system(): ");
else if (retval != 0)