JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cygwin: ioctl: TIOCINQ: always return number of chars in the inbound queue

Browse Source 
So far ioctl(TIOCINQ) could end up returning -1 with errno set to EINVAL
if a non-zero device error mask has been returned by ClearCommError.
This doesn't reflect Linux behaviour, which always returns the number of
chars in the inbound queue, independent of any I/O error condition.
EINVAL was a pretty weird error code to use in this scenario, too.

Fix this by dropping all checking for device errors in the TIOCINQ
case.  Just return the number of chars in the inbound queue.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2020-03-02 17:02:51 +01:00
parent cef36220f2
commit 1b7fcf22be
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
winsup/cygwin/fhandler_serial.cc
View File

@ -519,14 +519,7 @@ fhandler_serial::ioctl (unsigned int cmd, void *buf)
}
break;
case TIOCINQ:
if (ev & CE_FRAME || ev & CE_IOE || ev & CE_OVERRUN || ev & CE_RXOVER
|| ev & CE_RXPARITY)
{
set_errno (EINVAL); /* FIXME: Use correct errno */
res = -1;
}
else
ipbuf = st.cbInQue;
ipbuf = st.cbInQue;
break;
case TIOCGWINSZ:
((struct winsize *) buf)->ws_row = 0;

3
winsup/cygwin/release/3.1.5
View File

@ -9,3 +9,6 @@ Bug Fixes:
- Fix a segfault when starting, e.g., mintty from a bash in a console
running xterm emulation.
Addresses: https://cygwin.com/ml/cygwin/2020-02/msg00197.html
- Fix TIOCINQ to always return number of inbound chars if available.
Addresses: https://cygwin.com/ml/cygwin/2020-02/msg00258.html