mirror of
https://github.com/python/cpython.git
synced 2025-07-23 11:15:24 +00:00
gh-43414: os.get_terminal_size() now uses the actual file descriptor on Windows instead of mapping to standard handles (#93203)
This commit is contained in:
parent
390847922c
commit
edb72047f3
3 changed files with 17 additions and 15 deletions
|
@ -13247,24 +13247,11 @@ os_get_terminal_size_impl(PyObject *module, int fd)
|
|||
|
||||
#ifdef TERMSIZE_USE_CONIO
|
||||
{
|
||||
DWORD nhandle;
|
||||
HANDLE handle;
|
||||
CONSOLE_SCREEN_BUFFER_INFO csbi;
|
||||
switch (fd) {
|
||||
case 0: nhandle = STD_INPUT_HANDLE;
|
||||
break;
|
||||
case 1: nhandle = STD_OUTPUT_HANDLE;
|
||||
break;
|
||||
case 2: nhandle = STD_ERROR_HANDLE;
|
||||
break;
|
||||
default:
|
||||
return PyErr_Format(PyExc_ValueError, "bad file descriptor");
|
||||
}
|
||||
handle = GetStdHandle(nhandle);
|
||||
if (handle == NULL)
|
||||
return PyErr_Format(PyExc_OSError, "handle cannot be retrieved");
|
||||
handle = _Py_get_osfhandle(fd);
|
||||
if (handle == INVALID_HANDLE_VALUE)
|
||||
return PyErr_SetFromWindowsErr(0);
|
||||
return NULL;
|
||||
|
||||
if (!GetConsoleScreenBufferInfo(handle, &csbi))
|
||||
return PyErr_SetFromWindowsErr(0);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue