diff options
| author | Takashi Yano <takashi.yano@nifty.ne.jp> | 2022-03-04 10:05:35 +0300 |
|---|---|---|
| committer | Takashi Yano <takashi.yano@nifty.ne.jp> | 2022-03-04 14:05:04 +0300 |
| commit | 380e61dabe6cd5502046db425ff40815086b154a (patch) | |
| tree | 05b1fdc3372e653716e90552a9b2d9db3558ccac | |
| parent | 7a9321ceef27e80ca1e3bd94c3c2cf55f9f60160 (diff) | |
Cygwin: pty: Treat both CR and NL as line feed in transfer_inpup().
- To make read() work properly in canonical mode, writing to the pty
pipe should be done line by line. However, only CR was treated as
line separator previously in transfer_input(). This patch fixes
the issue.
| -rw-r--r-- | winsup/cygwin/fhandler_tty.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc index 1fd8a6094..2d7e2cf69 100644 --- a/winsup/cygwin/fhandler_tty.cc +++ b/winsup/cygwin/fhandler_tty.cc @@ -3972,9 +3972,11 @@ fhandler_pty_slave::transfer_input (tty::xfer_dir dir, HANDLE from, tty *ttyp, } /* Call WriteFile() line by line */ char *p0 = ptr; - char *p1 = ptr; - while ((p1 = (char *) memchr (p0, '\r', len - (p0 - ptr)))) + char *p_cr, *p_nl; + while ((p_cr = (char *) memchr (p0, '\r', len - (p0 - ptr))) + || (p_nl = (char *) memchr (p0, '\n', len - (p0 - ptr)))) { + char *p1 = p_cr ? (p_nl ? min (p_cr, p_nl) : p_cr) : p_nl; *p1 = '\n'; n = p1 - p0 + 1; if (n && WriteFile (to, p0, n, &n, NULL) && n) |