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:
parent
798184cc67
commit
1df2fa47b4
@ -6458,14 +6458,14 @@ mch_parse_cmd(char_u *cmd, int use_shcf, char ***argv, int *argc)
|
|||||||
while (*p != NUL && (inquote || (*p != ' ' && *p != TAB)))
|
while (*p != NUL && (inquote || (*p != ' ' && *p != TAB)))
|
||||||
{
|
{
|
||||||
if (p[0] == '"')
|
if (p[0] == '"')
|
||||||
/* quotes surrounding an argument and are dropped */
|
// quotes surrounding an argument and are dropped
|
||||||
inquote = !inquote;
|
inquote = !inquote;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (p[0] == '\\' && p[1] != NUL)
|
if (rem_backslash(p))
|
||||||
{
|
{
|
||||||
/* First pass: skip over "\ " and "\"".
|
// First pass: skip over "\ " and "\"".
|
||||||
* Second pass: Remove the backslash. */
|
// Second pass: Remove the backslash.
|
||||||
++p;
|
++p;
|
||||||
}
|
}
|
||||||
if (i == 1)
|
if (i == 1)
|
||||||
|
@ -1721,6 +1721,22 @@ func Test_read_from_terminated_job()
|
|||||||
call WaitForAssert({-> assert_equal(1, g:linecount)})
|
call WaitForAssert({-> assert_equal(1, g:linecount)})
|
||||||
endfunc
|
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()
|
func Test_env()
|
||||||
if !has('job')
|
if !has('job')
|
||||||
return
|
return
|
||||||
|
@ -792,6 +792,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
464,
|
||||||
/**/
|
/**/
|
||||||
463,
|
463,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user