c846bca992
* 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. Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
158 lines
4.0 KiB
C++
158 lines
4.0 KiB
C++
/* tty.h: shared tty info for cygwin
|
|
|
|
Copyright 2000, 2001, 2002, 2003, 2004, 2006, 2009, 2010, 2011, 2012, 2013,
|
|
2015 Red Hat, Inc.
|
|
|
|
This file is part of Cygwin.
|
|
|
|
This software is a copyrighted work licensed under the terms of the
|
|
Cygwin license. Please consult the file "CYGWIN_LICENSE" for
|
|
details. */
|
|
|
|
#ifndef _TTY_H
|
|
#define _TTY_H
|
|
/* tty tables */
|
|
|
|
#define INP_BUFFER_SIZE 256
|
|
#define OUT_BUFFER_SIZE 256
|
|
#define NTTYS 128
|
|
#define real_tty_attached(p) ((p)->ctty > 0 && !iscons_dev ((p)->ctty))
|
|
|
|
/* Input/Output/ioctl events */
|
|
|
|
#define INPUT_AVAILABLE_EVENT "cygtty.input.avail"
|
|
#define OUTPUT_MUTEX "cygtty.output.mutex"
|
|
#define INPUT_MUTEX "cygtty.input.mutex"
|
|
#define TTY_SLAVE_ALIVE "cygtty.slave_alive"
|
|
|
|
#include <sys/termios.h>
|
|
|
|
#ifndef MIN_CTRL_C_SLOP
|
|
#define MIN_CTRL_C_SLOP 50
|
|
#endif
|
|
|
|
#include <devices.h>
|
|
class tty_min
|
|
{
|
|
pid_t sid; /* Session ID of tty */
|
|
struct status_flags
|
|
{
|
|
unsigned initialized : 1; /* Set if tty is initialized */
|
|
unsigned rstcons : 1; /* Set if console needs to be set to "non-cooked" */
|
|
} status;
|
|
|
|
public:
|
|
pid_t pgid;
|
|
bool output_stopped; /* FIXME: Maybe do this with a mutex someday? */
|
|
fh_devices ntty;
|
|
DWORD last_ctrl_c; /* tick count of last ctrl-c */
|
|
bool is_console;
|
|
|
|
IMPLEMENT_STATUS_FLAG (bool, initialized)
|
|
IMPLEMENT_STATUS_FLAG (bool, rstcons)
|
|
|
|
struct termios ti;
|
|
struct winsize winsize;
|
|
|
|
/* ioctl requests buffer */
|
|
int cmd;
|
|
union
|
|
{
|
|
struct termios termios;
|
|
struct winsize winsize;
|
|
int value;
|
|
pid_t pid;
|
|
} arg;
|
|
/* XXX_retval variables holds master's completion codes. Error are stored as
|
|
* -ERRNO
|
|
*/
|
|
int ioctl_retval;
|
|
|
|
void setntty (_major_t t, _minor_t n) {ntty = (fh_devices) FHDEV (t, n);}
|
|
dev_t getntty () const {return ntty;}
|
|
_minor_t get_minor () const {return device::minor (ntty);}
|
|
pid_t getpgid () const {return pgid;}
|
|
void setpgid (int pid) {pgid = pid;}
|
|
int getsid () const {return sid;}
|
|
void setsid (pid_t tsid) {sid = tsid;}
|
|
void kill_pgrp (int);
|
|
int is_orphaned_process_group (int);
|
|
const __reg1 char *ttyname () __attribute (());
|
|
};
|
|
|
|
class fhandler_pty_master;
|
|
|
|
class tty: public tty_min
|
|
{
|
|
HANDLE __reg3 get_event (const char *fmt, PSECURITY_ATTRIBUTES sa,
|
|
BOOL manual_reset = FALSE);
|
|
public:
|
|
pid_t master_pid; /* PID of tty master process */
|
|
|
|
private:
|
|
HANDLE _from_master;
|
|
HANDLE _to_master;
|
|
HANDLE _to_master_cyg;
|
|
|
|
public:
|
|
HANDLE from_master() const { return _from_master; }
|
|
HANDLE to_master() const { return _to_master; }
|
|
HANDLE to_master_cyg() const { return _to_master_cyg; }
|
|
void set_from_master (HANDLE h) { _from_master = h; }
|
|
void set_to_master (HANDLE h) { _to_master = h; }
|
|
void set_to_master_cyg (HANDLE h) { _to_master_cyg = h; }
|
|
|
|
int read_retval;
|
|
bool was_opened; /* True if opened at least once. */
|
|
int column; /* Current Column */
|
|
|
|
void init ();
|
|
HANDLE open_inuse (ACCESS_MASK access);
|
|
HANDLE create_inuse (PSECURITY_ATTRIBUTES);
|
|
bool slave_alive ();
|
|
HANDLE open_mutex (const char *mutex, ACCESS_MASK access);
|
|
inline HANDLE open_output_mutex (ACCESS_MASK access)
|
|
{ return open_mutex (OUTPUT_MUTEX, access); }
|
|
inline HANDLE open_input_mutex (ACCESS_MASK access)
|
|
{ return open_mutex (INPUT_MUTEX, access); }
|
|
bool exists ();
|
|
bool not_allocated (HANDLE&, HANDLE&);
|
|
void set_master_ctl_closed () {master_pid = -1;}
|
|
static void __stdcall create_master (int);
|
|
static void __stdcall init_session ();
|
|
friend class fhandler_pty_master;
|
|
};
|
|
|
|
class tty_list
|
|
{
|
|
tty ttys[NTTYS];
|
|
static HANDLE mutex;
|
|
|
|
public:
|
|
tty * operator [](int n) {return ttys + device::minor (n);}
|
|
int allocate (HANDLE& r, HANDLE& w); /* allocate a pty */
|
|
int connect (int);
|
|
void init ();
|
|
tty_min *get_cttyp ();
|
|
int __reg2 attach (int n);
|
|
static void __stdcall init_session ();
|
|
friend class lock_ttys;
|
|
};
|
|
|
|
class lock_ttys
|
|
{
|
|
bool release_me;
|
|
public:
|
|
lock_ttys (DWORD = INFINITE);
|
|
static void release ();
|
|
void dont_release () {release_me = false;}
|
|
~lock_ttys ()
|
|
{
|
|
if (release_me)
|
|
release ();
|
|
}
|
|
};
|
|
|
|
extern "C" int ttyslot (void);
|
|
#endif /*_TTY_H*/
|