0
0
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00

patch 8.1.0464: MS-Windows: job_info() has cmd without backslashes

Problem:    MS-Windows: job_info() has cmd without backslashes. (Daniel
            Hahler)
Solution:   Use rem_backslash(). (closes #3517, closes #3404)
This commit is contained in:
Bram Moolenaar 2018-10-07 21:36:11 +02:00
parent 798184cc67
commit 1df2fa47b4
3 changed files with 22 additions and 4 deletions

View File

@ -6458,14 +6458,14 @@ mch_parse_cmd(char_u *cmd, int use_shcf, char ***argv, int *argc)
while (*p != NUL && (inquote || (*p != ' ' && *p != TAB)))
{
if (p[0] == '"')
/* quotes surrounding an argument and are dropped */
// quotes surrounding an argument and are dropped
inquote = !inquote;
else
{
if (p[0] == '\\' && p[1] != NUL)
if (rem_backslash(p))
{
/* First pass: skip over "\ " and "\"".
* Second pass: Remove the backslash. */
// First pass: skip over "\ " and "\"".
// Second pass: Remove the backslash.
++p;
}
if (i == 1)

View File

@ -1721,6 +1721,22 @@ func Test_read_from_terminated_job()
call WaitForAssert({-> assert_equal(1, g:linecount)})
endfunc
func Test_job_start_windows()
if !has('job') || !has('win32')
return
endif
" Check that backslash in $COMSPEC is handled properly.
let g:echostr = ''
let cmd = $COMSPEC . ' /c echo 123'
let job = job_start(cmd, {'callback': {ch,msg -> execute(":let g:echostr .= msg")}})
let info = job_info(job)
call assert_equal([$COMSPEC, '/c', 'echo', '123'], info.cmd)
call WaitForAssert({-> assert_equal("123", g:echostr)})
unlet g:echostr
endfunc
func Test_env()
if !has('job')
return

View File

@ -792,6 +792,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
464,
/**/
463,
/**/