From 91e0b943a07e768bbdcd7d8da2b991eee41fc0c4 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 28 Sep 2010 10:13:19 +0000 Subject: * fhandler_tty.cc (fhandler_pty_master::setup): Always create master thread. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/fhandler_tty.cc | 37 +++++++++++++++++-------------------- 2 files changed, 22 insertions(+), 20 deletions(-) (limited to 'winsup') diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index b673a0f20..620e512bc 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2010-09-28 Corinna Vinschen + + * fhandler_tty.cc (fhandler_pty_master::setup): Always create master + thread. + 2010-09-28 Corinna Vinschen * syscalls.cc (gethostid): Use correct path to ProductId registry value. diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc index 52b264a7d..a919d14e4 100644 --- a/winsup/cygwin/fhandler_tty.cc +++ b/winsup/cygwin/fhandler_tty.cc @@ -1796,27 +1796,24 @@ fhandler_pty_master::setup (bool ispty) if (!(input_mutex = CreateMutex (&sa, FALSE, buf))) goto err; - if (ispty) + /* Create master control pipe which allows the master to duplicate + the pty pipe handles to processes which deserve it. */ + __small_sprintf (buf, "\\\\.\\pipe\\cygwin-%S-tty%d-master-ctl", + &installation_key, get_unit ()); + master_ctl = CreateNamedPipe (buf, PIPE_ACCESS_DUPLEX, + PIPE_WAIT | PIPE_TYPE_MESSAGE + | PIPE_READMODE_MESSAGE, 1, 4096, 4096, + 0, &sec_all_nih); + if (master_ctl == INVALID_HANDLE_VALUE) { - /* Create master control pipe which allows the master to duplicate - the pty pipe handles to processes which deserve it. */ - __small_sprintf (buf, "\\\\.\\pipe\\cygwin-%S-tty%d-master-ctl", - &installation_key, get_unit ()); - master_ctl = CreateNamedPipe (buf, PIPE_ACCESS_DUPLEX, - PIPE_WAIT | PIPE_TYPE_MESSAGE - | PIPE_READMODE_MESSAGE, 1, 4096, 4096, - 0, &sec_all_nih); - if (master_ctl == INVALID_HANDLE_VALUE) - { - errstr = "pty master control pipe"; - goto err; - } - master_thread = new cygthread (::pty_master_thread, this, "pty_master"); - if (!master_thread) - { - errstr = "pty master control thread"; - goto err; - } + errstr = "pty master control pipe"; + goto err; + } + master_thread = new cygthread (::pty_master_thread, this, "pty_master"); + if (!master_thread) + { + errstr = "pty master control thread"; + goto err; } t.from_master = from_master; -- cgit v1.2.3