Skip to content

Commit

Permalink
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Browse files Browse the repository at this point in the history
Problem:    MS-Windows: Python3 issue with stdin.
Solution:   Check if stdin is readable. (Ken Takata, closes vim#7106)
  • Loading branch information
brammool committed Oct 10, 2020
1 parent bd6428b commit c6ed254
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 9 deletions.
34 changes: 25 additions & 9 deletions src/if_python3.c
Original file line number Diff line number Diff line change
Expand Up @@ -908,24 +908,42 @@ python3_loaded(void)
static wchar_t *py_home_buf = NULL;

#if defined(MSWIN) && (PY_VERSION_HEX >= 0x030500f0)
// Python 3.5 or later will abort inside Py_Initialize() when stdin is
// redirected. Reconnect stdin to NUL.
/*
* Return TRUE if stdin is readable from Python 3.
*/
static BOOL
is_stdin_readable(void)
{
DWORD mode, eventnum;
struct _stat st;
int fd = fileno(stdin);
HANDLE hstdin = (HANDLE)_get_osfhandle(fd);

// Check if stdin is connected to the console.
if (GetConsoleMode(hstdin, &mode))
// Check if it is opened as input.
return GetNumberOfConsoleInputEvents(hstdin, &eventnum);

return _fstat(fd, &st) == 0;
}

// Python 3.5 or later will abort inside Py_Initialize() when stdin has
// been closed (i.e. executed by "vim -"). Reconnect stdin to CONIN$.
// Note that the python DLL is linked to its own stdio DLL which can be
// differ from Vim's stdio.
static void
reset_stdin(void)
{
FILE *(*py__acrt_iob_func)(unsigned) = NULL;
FILE *(*pyfreopen)(const char *, const char *, FILE *) = NULL;
char *stdin_name = "NUL";
HINSTANCE hinst;

# ifdef DYNAMIC_PYTHON3
hinst = hinstPy3;
# else
hinst = GetModuleHandle(PYTHON3_DLL);
# endif
if (hinst == NULL)
if (hinst == NULL || is_stdin_readable())
return;

// Get "freopen" and "stdin" which are used in the python DLL.
Expand All @@ -938,14 +956,12 @@ reset_stdin(void)
if (hpystdiodll)
pyfreopen = (void *)GetProcAddress(hpystdiodll, "freopen");
}
if (isatty(fileno(stdin)))
stdin_name = "CONIN$";

// Reconnect stdin to NUL or CONIN$.
// Reconnect stdin to CONIN$.
if (pyfreopen != NULL)
pyfreopen(stdin_name, "r", py__acrt_iob_func(0));
pyfreopen("CONIN$", "r", py__acrt_iob_func(0));
else
freopen(stdin_name, "r", stdin);
freopen("CONIN$", "r", stdin);
}
#else
# define reset_stdin()
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -750,6 +750,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1830,
/**/
1829,
/**/
Expand Down

0 comments on commit c6ed254

Please sign in to comment.