This is the mail archive of the
cygwin
mailing list for the Cygwin project.
Re: Cygwin hangs up if several keys are typed during outputting a lot of texts.
- From: Takashi Yano <takashi dot yano at nifty dot ne dot jp>
- To: cygwin at cygwin dot com
- Date: Fri, 3 Apr 2015 13:07:35 +0900
- Subject: Re: Cygwin hangs up if several keys are typed during outputting a lot of texts.
- Authentication-results: sourceware.org; auth=none
- References: <20150228144019 dot 0e4cfdb3a26bfac361b538e2 at nifty dot ne dot jp> <20150228140251 dot GA11124 at calimero dot vinschen dot de> <20150302204502 dot 39b3e03ad5084b0b5add5d10 at nifty dot ne dot jp> <20150302144426 dot GK3213 at calimero dot vinschen dot de> <20150304203407 dot 14008531b0fb63ad5c19a33f at nifty dot ne dot jp> <20150304121952 dot GL3213 at calimero dot vinschen dot de> <20150304181857 dot GM3213 at calimero dot vinschen dot de> <20150305202456 dot 9ac4815a9d590145e15f7ae2 at nifty dot ne dot jp> <20150305125901 dot GX3213 at calimero dot vinschen dot de>
On Thu, 5 Mar 2015 13:59:01 +0100
Corinna Vinschen <corinna-cygwin@cygwin.com> wrote:
> > One small thing to be improved is here:
> >
> > + if (echo_cnt > 0
> > + && ReadFile (echo_r, outbuf, MIN (rlen, echo_cnt), &n, NULL))
> >
> > echo_cnt returned by ::bytes_available() is actually
> > not a number of bytes available in the pipe. This is
> > because ::bytes_available() returns "nleft" instead
> > of "navail" when "nleft" is non-zero.
> >
> > Therefore, "rlen" should be used here rather than
> > "MIN (rlen, echo_cnt)".
>
> Thanks, done. I applied the patch now with two additional changes for
> better error handling.
For the same reason, I propose the following patch.
2015-04-03 Takashi Yano <takashi.yano@nifty.ne.jp>
* fhandler_tty.cc (fhandler_pty_slave::read): Change calculation of
"readlen" not to use "bytes_in_pype" value directly.
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 89cc9e5..daa24eb 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -742,7 +742,7 @@ fhandler_pty_slave::read (void *ptr, size_t& len)
return;
}
- readlen = MIN (bytes_in_pipe, MIN (len, sizeof (buf)));
+ readlen = bytes_in_pipe ? MIN (len, sizeof (buf)) : 0;
#if 0
/* Why on earth is the read length reduced to vmin, even if more bytes
--
Takashi Yano <takashi.yano@nifty.ne.jp>
--
Problem reports: http://cygwin.com/problems.html
FAQ: http://cygwin.com/faq/
Documentation: http://cygwin.com/docs.html
Unsubscribe info: http://cygwin.com/ml/#unsubscribe-simple