diff options
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_tty.cc | 17 |
2 files changed, 17 insertions, 5 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 94549185e..e7f155dff 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,10 @@ 2011-05-02 Corinna Vinschen <corinna@vinschen.de> + * fhndler_tty.cc (andler_pty_master::process_slave_output): Make + interruptible and cancelable. Fix nonblocking case. + +2011-05-02 Corinna Vinschen <corinna@vinschen.de> + * fhandler_console.cc (fhandler_console::read): Make restartable and cancelable. diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc index e6c4f3fb7..5b0a1c595 100644 --- a/winsup/cygwin/fhandler_tty.cc +++ b/winsup/cygwin/fhandler_tty.cc @@ -305,16 +305,23 @@ fhandler_pty_master::process_slave_output (char *buf, size_t len, int pktmode_on if (hit_eof ()) goto out; /* DISCARD (FLUSHO) and tcflush can finish here. */ - if (n == 0 && (get_ttyp ()->ti.c_lflag & FLUSHO || !buf)) + if ((get_ttyp ()->ti.c_lflag & FLUSHO || !buf)) goto out; - if (n == 0 && is_nonblocking ()) + if (is_nonblocking ()) { set_errno (EAGAIN); rc = -1; - break; + goto out; } - - Sleep (10); + pthread_testcancel (); + if (WaitForSingleObject (signal_arrived, 10) == WAIT_OBJECT_0 + && !_my_tls.call_signal_handler ()) + { + set_errno (EINTR); + rc = -1; + goto out; + } + } if (ReadFile (handle, outbuf, rlen, &n, NULL) == FALSE) |