diff options
| author | Christopher Faylor <me@cgf.cx> | 2012-04-05 06:54:51 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2012-04-05 06:54:51 +0400 |
| commit | 7b03b0d8cee0ab8ef442d0d1ed2031f77207557a (patch) | |
| tree | 4cb0a3863b4e702b974fe86fe483c73ab3465dc6 /winsup/cygwin/fhandler.h | |
| parent | ffcd2c3f894413870b4431677d94044ca0336c1b (diff) | |
* fhandler.h (fhandler_pty_common::bytes_available): Declare new function.
(fhandler_pty_master::flush_to_slave): Ditto.
* fhandler_tty.cc (bytes_available): Define new function.
(fhandler_pty_common::bytes_available): Ditto.
(handler_pty_master::flush_to_slave): Ditto.
(fhandler_pty_master::process_slave_output): Call flush_to_slave () here. Use
bytes_available () rather than PeekNamedPipe. Cleanup sloppy logic.
(fhandler_pty_slave::read): Use bytes_available () rather than PeekNamedPipe.
(fhandler_pty_slave::ioctl): Ditto.
(fhandler_pty_master::ioctl): Ditto.
(fhandler_pty_master::cleanup): Remove ancient #if 0.
* select.cc (peek_pipe): Call flush_to_slave whenever we're checking for a pty
master.
Diffstat (limited to 'winsup/cygwin/fhandler.h')
| -rw-r--r-- | winsup/cygwin/fhandler.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h index cad30189f..06fa7c4c4 100644 --- a/winsup/cygwin/fhandler.h +++ b/winsup/cygwin/fhandler.h @@ -1433,6 +1433,7 @@ class fhandler_pty_common: public fhandler_termios int close (); _off64_t lseek (_off64_t, int); + bool bytes_available (DWORD& n); void set_close_on_exec (bool val); select_record *select_read (select_stuff *); select_record *select_write (select_stuff *); @@ -1549,6 +1550,7 @@ public: void fixup_after_fork (HANDLE parent); void fixup_after_exec (); int tcgetpgrp (); + void flush_to_slave (); fhandler_pty_master (void *) {} ~fhandler_pty_master (); |