- 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.
---
 winsup/cygwin/fhandler_tty.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 2f13e9990..76c5e2413 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -3938,9 +3938,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)
-- 
2.35.1

Reply via email to