* cygheap.h (init_cygheap::ctty_on_hold): Remove conditionalized variable.
* dcrt0.cc (do_exit): Remove code which handled CYGWIN=tty style ttys. * devices.in: Remove "/dev/ttym". * dtable.cc: Rename tty to pty where appropriate throughout. (dtable::stdio_init): Use new t->is_console rather than using now-deleted hwnd element in tty structure. (dtable::init_std_file_from_handle): Remove code which handled CYGWIN=tty style ttys. (fh_alloc): Ditto. * fhandler.h: Rename tty to pty where appropriate. (fhandler_pty_common): Delete output_done_event, ioctl_request_event, ioctl_done_event. (fhandler_pty_master::setup): Delete argument. (fhandler_tty_master): Delete. (fhandler_union): Delete __tty_master. * fhandler_console.cc (use_tty): Delete. (fhandler_console::get_tty_stuff): Set is_console to true rather than calling sethwnd. (fhandler_console::send_winch_maybe): Remove CYGWIN=tty considerations. (fhandler_console::input_tcsetattr): Ditto. * fhandler_termios.cc (fhandler_termios::tcsetpgrp): Use new t->is_console rather than using now-deleted hwnd element in tty structure. * fhandler_tty.cc: Rename tty to pty where appropriate throughout. (tty_master): Delete. (process_input): Ditto. (process_output): Ditto. (process_ioctl): Ditto. (fhandler_tty_master::*): Ditto. (fhandler_pty_master::process_slave_output): Remove CYGWIN=tty considerations. (fhandler_pty_slave::open): Ditto for *_done_event. (fhandler_pty_slave::write): Ditto. (fhandler_pty_slave::ioctl): Ditto. (fhandler_pty_slave::fch_open_handles): Ditto. (fhandler_pty_slave::fch_set_sd): Ditto. (fhandler_pty_slave::fch_close_handles): Ditto. (fhandler_pty_common::close): Ditto. (fhandler_pty_master::setup): Ditto. Remove now-unneeded ispty parameter. (fhandler_pty_master::open): Reflect argument removal for tty::allocate. * select.cc: Rename tty to pty where appropriate throughout. * sigproc.cc (proc_subproc): Remove CYGWIN=tty considerations. * tty.cc (ttyslot): Accommodate CYGWIN=tty removal. (tty_list::init_session): Ditto. (tty_list::attach): Ditto. (tty::create_master): Delete. (tty_list::terminate): Ditto. (tty_list::allocate): Delete "with_console" parameter. Remove CYGWIN=tty considerations. (tty::init): Set is_console = false. Use 'false' for was_opened since it is a boolean. * tty.h (*_{DONE,REQUEST}_EVENT): Delete. (tty_min::is_console): Declare new field which replaces hwnd. (tty_min::gethwnd): Delete. (tty_min::sethwnd): Ditto. (tty_list::allocate): Delete parameter. (tty_list::terminate): Delete declaration. * include/sys/cygwin.h (PID_USETTY): Redefine to PID_UNUSED1 and change comment to reflect its availability.
This commit is contained in:
@@ -2645,7 +2645,6 @@ static const device dev_storage[] =
|
||||
{"/dev/ttyS61", BRACK(FHDEV(DEV_SERIAL_MAJOR, 61)), "\\??\\COM62"},
|
||||
{"/dev/ttyS62", BRACK(FHDEV(DEV_SERIAL_MAJOR, 62)), "\\??\\COM63"},
|
||||
{"/dev/ttyS63", BRACK(FHDEV(DEV_SERIAL_MAJOR, 63)), "\\??\\COM64"},
|
||||
{"/dev/ttym", BRACK(FH_TTYM), "/dev/ttym"},
|
||||
{"/dev/urandom", BRACK(FH_URANDOM), "/dev/urandom"},
|
||||
{"/dev/windows", BRACK(FH_WINDOWS), "/dev/windows"},
|
||||
{"/dev/zero", BRACK(FH_ZERO), "/dev/zero"}
|
||||
@@ -2653,9 +2652,8 @@ static const device dev_storage[] =
|
||||
|
||||
const device *cons_dev = dev_storage + 20;
|
||||
const device *console_dev = dev_storage + 84;
|
||||
const device *ttym_dev = dev_storage + 2577;
|
||||
const device *ttys_dev = dev_storage + 2449;
|
||||
const device *urandom_dev = dev_storage + 2578;
|
||||
const device *urandom_dev = dev_storage + 2577;
|
||||
|
||||
|
||||
static KR_device_t KR_find_keyword (const char *KR_keyword, int KR_length)
|
||||
@@ -3839,21 +3837,6 @@ return NULL;
|
||||
case 'y':
|
||||
switch (KR_keyword [8])
|
||||
{
|
||||
case 'm':
|
||||
if (strncmp (KR_keyword, "/dev/ttym", 9) == 0)
|
||||
{
|
||||
{
|
||||
return dev_storage + 2577;
|
||||
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
{
|
||||
return NULL;
|
||||
|
||||
}
|
||||
}
|
||||
case '9':
|
||||
switch (KR_keyword [5])
|
||||
{
|
||||
@@ -5358,7 +5341,7 @@ return NULL;
|
||||
if (strncmp (KR_keyword, "/dev/zero", 9) == 0)
|
||||
{
|
||||
{
|
||||
return dev_storage + 2580;
|
||||
return dev_storage + 2579;
|
||||
|
||||
}
|
||||
}
|
||||
@@ -44583,7 +44566,7 @@ return NULL;
|
||||
if (strncmp (KR_keyword, "/dev/windows", 12) == 0)
|
||||
{
|
||||
{
|
||||
return dev_storage + 2579;
|
||||
return dev_storage + 2578;
|
||||
|
||||
}
|
||||
}
|
||||
@@ -44598,7 +44581,7 @@ return NULL;
|
||||
if (strncmp (KR_keyword, "/dev/urandom", 12) == 0)
|
||||
{
|
||||
{
|
||||
return dev_storage + 2578;
|
||||
return dev_storage + 2577;
|
||||
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user