diff options
| author | Christopher Faylor <me@cgf.cx> | 2002-08-31 03:35:50 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2002-08-31 03:35:50 +0000 |
| commit | 7a1174dcf22c00e6dcb8f9ad781df274aa722354 (patch) | |
| tree | 387c2ddc3edb9f436d86f52915728198b2a162df /winsup/cygwin/fhandler_tty.cc | |
| parent | f80e156de95bbf723355cde3d9ba1d2a66eefef0 (diff) | |
| download | cygnal-7a1174dcf22c00e6dcb8f9ad781df274aa722354.tar.gz cygnal-7a1174dcf22c00e6dcb8f9ad781df274aa722354.tar.bz2 cygnal-7a1174dcf22c00e6dcb8f9ad781df274aa722354.zip | |
(inspired by a patch from Egor Duda)
* select.cc (fhandler_tty_slave::ready_for_read): Remove.
* fhandler.h (fhandler_tty_slave::ready_for_read): Remove declaration.
* fhandler_tty.cc (fhandler_tty_slave::read): Don't do anything special with
vtime when vmin == 0.
* autoload.cc (GetConsoleWindow): Correct parameter count.
Diffstat (limited to 'winsup/cygwin/fhandler_tty.cc')
| -rw-r--r-- | winsup/cygwin/fhandler_tty.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc index acc32f883..95aff5fc1 100644 --- a/winsup/cygwin/fhandler_tty.cc +++ b/winsup/cygwin/fhandler_tty.cc @@ -412,6 +412,7 @@ process_ioctl (void *) fhandler_tty_slave::fhandler_tty_slave (int num) : fhandler_tty_common (FH_TTYS, num) { + set_r_no_interrupt (1); } fhandler_tty_slave::fhandler_tty_slave () @@ -666,12 +667,11 @@ fhandler_tty_slave::read (void *ptr, size_t len) if (vmin > INP_BUFFER_SIZE) vmin = INP_BUFFER_SIZE; vtime = get_ttyp ()->ti.c_cc[VTIME]; - if (vmin < 0) vmin = 0; - if (vtime < 0) vtime = 0; - if (vmin == 0) - time_to_wait = INFINITE; - else - time_to_wait = (vtime == 0 ? INFINITE : 100 * vtime); + if (vmin < 0) + vmin = 0; + if (vtime < 0) + vtime = 0; + time_to_wait = vtime == 0 ? INFINITE : 100 * vtime; } else time_to_wait = INFINITE; @@ -910,8 +910,8 @@ fhandler_tty_slave::ioctl (unsigned int cmd, void *arg) { termios_printf ("ioctl (%x)", cmd); - if (myself->pgid && get_ttyp ()->getpgid () != myself->pgid && - myself->ctty == ttynum && (get_ttyp ()->ti.c_lflag & TOSTOP)) + if (myself->pgid && get_ttyp ()->getpgid () != myself->pgid + && myself->ctty == ttynum && (get_ttyp ()->ti.c_lflag & TOSTOP)) { /* background process */ termios_printf ("bg ioctl pgid %d, tpgid %d, ctty %d", |