JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* fhandler_tty.cc (fhandler_tty_slave::open): Add code to duplicate 

handles within a single process to simplify openpty case.
	(fhandler_tty_slave::cygserver_attach_tty): Correctly send Windows PID
	to cygserver, rather than the Cygwin PID.
This commit is contained in:
Corinna Vinschen 2010-04-12 13:28:06 +00:00
parent 7092cadf76
commit 42e9cefd71
2 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,10 @@
2010-04-12 Corinna Vinschen <corinna@vinschen.de>
* fhandler_tty.cc (fhandler_tty_slave::open): Add code to duplicate
handles within a single process to simplify openpty case.
(fhandler_tty_slave::cygserver_attach_tty): Correctly send Windows PID
to cygserver, rather than the Cygwin PID.
2010-04-11 Corinna Vinschen <corinna@vinschen.de> 2010-04-11 Corinna Vinschen <corinna@vinschen.de>
* fhandler.h (class dev_console): Add backspace_keycode member. * fhandler.h (class dev_console): Add backspace_keycode member.

37
winsup/cygwin/fhandler_tty.cc
View File

@ -531,7 +531,8 @@ fhandler_tty_slave::open (int flags, mode_t)
goto err_no_errno; goto err_no_errno;
} }
if (cygserver_running == CYGSERVER_UNAVAIL if (myself->pid == get_ttyp ()->master_pid
|| cygserver_running == CYGSERVER_UNAVAIL
|| !cygserver_attach_tty (&from_master_local, &to_master_local)) || !cygserver_attach_tty (&from_master_local, &to_master_local))
{ {
if (get_ttyp ()->master_pid < 0) if (get_ttyp ()->master_pid < 0)
@ -547,15 +548,24 @@ fhandler_tty_slave::open (int flags, mode_t)
set_errno (EAGAIN); set_errno (EAGAIN);
goto err_no_errno; goto err_no_errno;
} }
termios_printf ("cannot dup handles via server. using old method."); HANDLE tty_owner;
HANDLE tty_owner = OpenProcess (PROCESS_DUP_HANDLE, FALSE, if (myself->pid == get_ttyp ()->master_pid)
p->dwProcessId);
if (tty_owner == NULL)
{ {
termios_printf ("can't open tty (%d) handle process %d", /* This is the most common case, just calling openpty. */
get_unit (), get_ttyp ()->master_pid); termios_printf ("dup handles within myself.");
__seterrno (); tty_owner = GetCurrentProcess ();
goto err_no_msg; }
else
{
termios_printf ("cannot dup handles via server. using old method.");
tty_owner = OpenProcess (PROCESS_DUP_HANDLE, FALSE, p->dwProcessId);
if (tty_owner == NULL)
{
termios_printf ("can't open tty (%d) handle process %d",
get_unit (), get_ttyp ()->master_pid);
__seterrno ();
goto err_no_msg;
}
} }
if (!DuplicateHandle (tty_owner, get_ttyp ()->from_master, if (!DuplicateHandle (tty_owner, get_ttyp ()->from_master,
@ -577,7 +587,8 @@ fhandler_tty_slave::open (int flags, mode_t)
goto err; goto err;
} }
VerifyHandle (to_master_local); VerifyHandle (to_master_local);
CloseHandle (tty_owner); if (tty_owner != GetCurrentProcess ())
CloseHandle (tty_owner);
} }
termios_printf ("duplicated from_master %p->%p from tty_owner", termios_printf ("duplicated from_master %p->%p from tty_owner",
@ -655,7 +666,11 @@ fhandler_tty_slave::cygserver_attach_tty (LPHANDLE from_master_ptr,
if (!from_master_ptr || !to_master_ptr) if (!from_master_ptr || !to_master_ptr)
return 0; return 0;
client_request_attach_tty req ((DWORD) get_ttyp ()->master_pid, pinfo p (get_ttyp ()->master_pid);
if (!p)
return 0;
client_request_attach_tty req (p->dwProcessId,
(HANDLE) get_ttyp ()->from_master, (HANDLE) get_ttyp ()->from_master,
(HANDLE) get_ttyp ()->to_master); (HANDLE) get_ttyp ()->to_master);