(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.
This commit is contained in:
Christopher Faylor
2002-08-31 03:35:50 +00:00
parent f80e156de9
commit 7a1174dcf2
5 changed files with 22 additions and 45 deletions

View File

@@ -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",