mirror of
https://github.com/vim/vim.git
synced 2025-09-25 03:54:15 -04:00
patch 8.1.0796: MS-Windows 7: problem with named pipe on channel
Problem: MS-Windows 7: problem with named pipe on channel. Solution: Put back the disconnect/connect calls. (Yasuhiro Matsumoto, closes #3833)
This commit is contained in:
@@ -3181,7 +3181,13 @@ channel_wait(channel_T *channel, sock_T fd, int timeout)
|
||||
|
||||
if (r && nread > 0)
|
||||
return CW_READY;
|
||||
if (r == 0)
|
||||
|
||||
if (channel->ch_named_pipe)
|
||||
{
|
||||
DisconnectNamedPipe((HANDLE)fd);
|
||||
ConnectNamedPipe((HANDLE)fd, NULL);
|
||||
}
|
||||
else if (r == 0)
|
||||
return CW_ERROR;
|
||||
|
||||
/* perhaps write some buffer lines */
|
||||
@@ -3813,7 +3819,16 @@ channel_send(
|
||||
if (part == PART_SOCK)
|
||||
res = sock_write(fd, (char *)buf, len);
|
||||
else
|
||||
{
|
||||
res = fd_write(fd, (char *)buf, len);
|
||||
#ifdef WIN32
|
||||
if (channel->ch_named_pipe && res < 0)
|
||||
{
|
||||
DisconnectNamedPipe((HANDLE)fd);
|
||||
ConnectNamedPipe((HANDLE)fd, NULL);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
if (res < 0 && (errno == EWOULDBLOCK
|
||||
#ifdef EAGAIN
|
||||
|| errno == EAGAIN
|
||||
|
@@ -644,8 +644,7 @@ endfunc
|
||||
|
||||
func Test_terminal_no_cmd()
|
||||
" Does not work on Mac.
|
||||
" Todo: make this work on Win32 again
|
||||
if has('mac') || has('win32')
|
||||
if has('mac')
|
||||
return
|
||||
endif
|
||||
let buf = term_start('NONE', {})
|
||||
|
@@ -791,6 +791,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
796,
|
||||
/**/
|
||||
795,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user