* 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.

1 files changed, 13 insertions, 36 deletions

diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h
index 70c882117..34da53a87 100644
--- a/winsup/cygwin/fhandler.h
+++ b/winsup/cygwin/fhandler.h
@@ -901,7 +901,7 @@ class fhandler_serial: public fhandler_base
   void fixup_after_exec ();
 
   /* We maintain a pgrp so that tcsetpgrp and tcgetpgrp work, but we
-     don't use it for permissions checking.  fhandler_tty_slave does
+     don't use it for permissions checking.  fhandler_pty_slave does
      permission checking on pgrps.  */
   virtual int tcgetpgrp () { return pgrp_; }
   virtual int tcsetpgrp (const pid_t pid) { pgrp_ = pid; return 0; }
@@ -1132,22 +1132,16 @@ private:
   friend tty_min * tty_list::get_cttyp ();
 };
 
-class fhandler_tty_common: public fhandler_termios
+class fhandler_pty_common: public fhandler_termios
 {
  public:
-  fhandler_tty_common ()
-    : fhandler_termios (), output_done_event (NULL),
-    ioctl_request_event (NULL), ioctl_done_event (NULL), output_mutex (NULL),
+  fhandler_pty_common ()
+    : fhandler_termios (),
+      output_mutex (NULL),
     input_mutex (NULL), input_available_event (NULL)
   {
     // nothing to do
   }
-  HANDLE output_done_event;	// Raised by master when tty's output buffer
-				// written. Write status in tty::write_retval.
-  HANDLE ioctl_request_event;	// Raised by slave to perform ioctl() request.
-				// Ioctl() request in tty::cmd/arg.
-  HANDLE ioctl_done_event;	// Raised by master on ioctl() completion.
-				// Ioctl() status in tty::ioctl_retval.
   HANDLE output_mutex, input_mutex;
   HANDLE input_available_event;
 
@@ -1162,7 +1156,7 @@ class fhandler_tty_common: public fhandler_termios
   select_record *select_except (select_stuff *);
 };
 
-class fhandler_tty_slave: public fhandler_tty_common
+class fhandler_pty_slave: public fhandler_pty_common
 {
   HANDLE inuse;			// used to indicate that a tty is in use
 
@@ -1173,7 +1167,7 @@ class fhandler_tty_slave: public fhandler_tty_common
 
  public:
   /* Constructor */
-  fhandler_tty_slave (int);
+  fhandler_pty_slave (int);
 
   bool use_archetype () const {return true;}
   int open (int flags, mode_t mode = 0);
@@ -1201,7 +1195,7 @@ class fhandler_tty_slave: public fhandler_tty_common
   size_t size () const { return sizeof (*this);}
 };
 
-class fhandler_pty_master: public fhandler_tty_common
+class fhandler_pty_master: public fhandler_pty_common
 {
   int pktmode;			// non-zero if pty in a packet mode.
   HANDLE master_ctl;		// Control socket for handle duplication
@@ -1210,6 +1204,7 @@ class fhandler_pty_master: public fhandler_tty_common
 public:
   int need_nl;			// Next read should start with \n
   DWORD dwProcessId;		// Owner of master handles
+  HANDLE from_master, to_master;
 
   /* Constructor */
   fhandler_pty_master ();
@@ -1232,29 +1227,12 @@ public:
 
   char *ptsname ();
 
-  HANDLE from_master, to_master;
   bool hit_eof ();
-  bool setup (bool);
+  bool setup ();
   int dup (fhandler_base *);
   void fixup_after_fork (HANDLE parent);
   void fixup_after_exec ();
   int tcgetpgrp ();
-  virtual bool is_tty_master () const {return false;}
-  size_t size () const { return sizeof (*this);}
-};
-
-class fhandler_tty_master: public fhandler_pty_master
-{
- public:
-  /* Constructor */
-  fhandler_console *console;	// device handler to perform real i/o.
-  bool use_archetype () const {return false;}
-
-  fhandler_tty_master ();
-  int init ();
-  int init_console ();
-  void set_winsize (bool);
-  bool is_tty_master () const {return true;}
   size_t size () const { return sizeof (*this);}
 };
 
@@ -1567,7 +1545,7 @@ struct fhandler_nodevice: public fhandler_base
 #define report_tty_counts(fh, call, use_op) \
   termios_printf ("%s %s, %susecount %d",\
 		  fh->ttyname (), call,\
-		  use_op, ((fhandler_tty_slave *) (fh->archetype ?: fh))->usecount);
+		  use_op, ((fhandler_pty_slave *) (fh->archetype ?: fh))->usecount);
 
 typedef union
 {
@@ -1599,9 +1577,8 @@ typedef union
   char __serial[sizeof (fhandler_serial)];
   char __socket[sizeof (fhandler_socket)];
   char __termios[sizeof (fhandler_termios)];
-  char __tty_common[sizeof (fhandler_tty_common)];
-  char __tty_master[sizeof (fhandler_tty_master)];
-  char __tty_slave[sizeof (fhandler_tty_slave)];
+  char __pty_common[sizeof (fhandler_pty_common)];
+  char __pty_slave[sizeof (fhandler_pty_slave)];
   char __virtual[sizeof (fhandler_virtual)];
   char __windows[sizeof (fhandler_windows)];
 } fhandler_union;