Revert "Revert "Fix OPOST for non-Cygwin pty slaves""

This revert unfortunately reintroduced the "jagged lines" problem. In
any case, the culprit this developer tried to fix by reverting the OPOST
commit is better worked around in the Git wrapper by forcing
`git-bash.exe` to allocate a new console for use by MSys2.

This reverts commit aae52e6.

Author: dscho

winsup/cygwin/ChangeLog

@@ -3,6 +3,66 @@
 	* fhandler_tty.cc (fhandler_pty_slave::fch_close_handles): Don't close
 	handles not opened via fhandler_pty_slave::fch_open_handles.
 
+2015-04-22  Takashi Yano  <[email protected]>
+
+	* fhandler.h (class fhandler_base): Add virtual function
+	get_io_handle_cyg() to get handle from which OPOST-processed output is
+	read on PTY master.
+	(class fhandler_pty_slave): Add variable output_handle_cyg to store a
+	handle to which OPOST-processed output is written. Add two functions,
+	i.e., set_output_handle_cyg() and get_output_handle_cyg(), regarding
+	variable output_handle_cyg. Now, output_handle is used only by native
+	windows program. The data before OPOST-processing is written to
+	output_handle and OPOST-processing is applied in the master-side. For a
+	cygwin process, OPOST-processing is applied in the slave-side, and the
+	data after OPOST-processing is written to output_handle_cyg.
+	(class fhandler_pty_master): Add two variables, i.e., io_handle_cyg and
+	to_master_cyg, to store handles of a pipe through which OPOST-processed
+	output passes. Add pty_master_fwd_thread and function
+	pty_master_fwd_thread() for a thread which applies OPOST-processing
+	and forwards data from io_handle to to_master_cyg. Add function
+	get_io_handle_cyg() regarding variable io_handle_cyg. Now, the pipe
+	between io_handle and to_master are used only by native windows program
+	for applying OPOST-processing in the master-side. For a cygwin process,
+	the pipe between io_handle_cyg and to_master_cyg is used for passing
+	through the data which is applied OPOST-processing in the slave-side.
+	* fhandler_tty.cc (struct pipe_reply): Add member to_master_cyg.
+	(fhandler_pty_master::process_slave_output): Read slave output from
+	io_handle_cyg rather than io_handle.
+	(fhandler_pty_slave::fhandler_pty_salve): Initialize output_handle_cyg.
+	(fhandler_pty_slave::open): Set output_handle_cyg by duplicating handle
+	to_master_cyg on PTY master.
+	(fhandler_pty_slave::close): Close handle output_handle_cyg.
+	(fhandler_pty_slave::write): Write data to output_handle_cyg rather
+	than output_handle.
+	(fhandler_pty_slave::fch_close_handles): Close handle output_handle_cyg.
+	(fhandler_pty_master::fhandler_pty_master): Initialize io_handle_cyg,
+	to_master_cyg and master_fwd_thread.
+	(fhandler_pty_master::cleanup): Clean up to_master_cyg as well.
+	(fhandler_pty_master::close): Print to_master_cyg as well in debug
+	message. Terminate master forwarding thread. Close handles
+	to_master_cyg and io_handle_cyg.
+	(fhandler_pty_master::ioctl): Use io_handle_cyg rather than to_master.
+	(fhandler_pty_master::pty_master_thread): Add code for duplicating
+	handle to_master_cyg.
+	(fhandler_pty_master::pty_master_fwd_thread): New function for a thread
+	to forward OPOST-processed data from io_handle to to_master_cyg.  This
+	thread applies OPOST-processing to the output of native windows program.
+	(::pty_master_fwd_thread): Ditto.
+	(fhandler_pty_master::setup): Create a new pipe to pass thruegh OPOST-
+	processed output. Create new thread to forward data from io_handle to
+	to_master_cyg. Set handle to_master_cyg to tty. Print io_handle_cyg as
+	well in debug message. Close handles io_handle_cyg and to_master_cyg in
+	case of error.
+	(fhandler_pty_master::fixup_after_fork): Set handle to_master_cyg to
+	tty. Copy handle to_master_cyg from arch->to_master_cyg.
+	(fhandler_pty_master::fixup_after_exec): Clean up to_master_cyg.
+	* select.cc: Check handle returned by get_io_handle_cyg() rather than
+	get_handle().
+	* tty.h (class tty): Add variable _to_master_cyg to store a handle to
+	which OPOST-processed data is written. Add two functions,
+	to_master_cyg() and set_to_master_cyg(), regarding _to_master_cyg.
+
 2015-04-22  Corinna Vinschen  <[email protected]>
 
 	* path.cc (basename): Undefine basename before defining function to

winsup/cygwin/fhandler.h

@@ -412,6 +412,7 @@ class fhandler_base
      that some fd's have two handles. */
   virtual HANDLE& get_handle () { return io_handle; }
   virtual HANDLE& get_io_handle () { return io_handle; }
+  virtual HANDLE& get_io_handle_cyg () { return io_handle; }
   virtual HANDLE& get_output_handle () { return io_handle; }
   virtual HANDLE get_stat_handle () { return pc.handle () ?: io_handle; }
   virtual HANDLE get_echo_handle () const { return NULL; }
@@ -1516,6 +1517,7 @@ class fhandler_pty_common: public fhandler_termios
 class fhandler_pty_slave: public fhandler_pty_common
 {
   HANDLE inuse;			// used to indicate that a tty is in use
+  HANDLE output_handle_cyg;
 
   /* Helper functions for fchmod and fchown. */
   bool fch_open_handles (bool chown);
@@ -1526,6 +1528,9 @@ class fhandler_pty_slave: public fhandler_pty_common
   /* Constructor */
   fhandler_pty_slave (int);
 
+  void set_output_handle_cyg (HANDLE h) { output_handle_cyg = h; }
+  HANDLE& get_output_handle_cyg () { return output_handle_cyg; }
+
   int open (int flags, mode_t mode = 0);
   void open_setup (int flags);
   ssize_t __stdcall write (const void *ptr, size_t len);
@@ -1576,13 +1581,17 @@ class fhandler_pty_master: public fhandler_pty_common
   HANDLE from_master, to_master;
   HANDLE echo_r, echo_w;
   DWORD dwProcessId;		// Owner of master handles
+  HANDLE io_handle_cyg, to_master_cyg;
+  cygthread *master_fwd_thread;	// Master forwarding thread
 
 public:
   HANDLE get_echo_handle () const { return echo_r; }
+  HANDLE& get_io_handle_cyg () { return io_handle_cyg; }
   /* Constructor */
   fhandler_pty_master (int);
 
   DWORD pty_master_thread ();
+  DWORD pty_master_fwd_thread ();
   int process_slave_output (char *buf, size_t len, int pktmode_on);
   void doecho (const void *str, DWORD len);
   int accept_input ();