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

* fhandler_tty.cc (fhandler_tty_slave::open): Conditionalize a little more of

Browse Source 
the cygserver stuff so that ttys actually work.
This commit is contained in:
Christopher Faylor 2003-07-03 21:22:17 +00:00
parent 6556178009
commit 3d8a75bdbe
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
2003-07-03 Christopher Faylor <cgf@redhat.com>
* fhandler_tty.cc (fhandler_tty_slave::open): Conditionalize a little
more of the cygserver stuff so that ttys actually work.
2003-07-03 Corinna Vinschen <corinna@vinschen.de> 2003-07-03 Corinna Vinschen <corinna@vinschen.de>
* mmap.cc (mmap64): Allow MAP_FIXED with pagesize granularity (4K). * mmap.cc (mmap64): Allow MAP_FIXED with pagesize granularity (4K).

11
winsup/cygwin/fhandler_tty.cc
View File

@ -507,12 +507,11 @@ fhandler_tty_slave::open (path_conv *, int flags, mode_t)
HANDLE from_master_local, to_master_local; HANDLE from_master_local, to_master_local;
if (!wincap.has_security ()
#ifdef USE_CYGSERVER #ifdef USE_CYGSERVER
if (!wincap.has_security ()
|| cygserver_running == CYGSERVER_UNAVAIL || cygserver_running == CYGSERVER_UNAVAIL
|| !cygserver_attach_tty (&from_master_local, &to_master_local) || !cygserver_attach_tty (&from_master_local, &to_master_local))
#endif #endif
)
{ {
termios_printf ("cannot dup handles via server. using old method."); termios_printf ("cannot dup handles via server. using old method.");
@ -596,10 +595,12 @@ int
fhandler_tty_slave::cygserver_attach_tty (LPHANDLE from_master_ptr, fhandler_tty_slave::cygserver_attach_tty (LPHANDLE from_master_ptr,
LPHANDLE to_master_ptr) LPHANDLE to_master_ptr)
{ {
#ifndef USE_CYGSERVER
return 0;
#else
if (!from_master_ptr || !to_master_ptr) if (!from_master_ptr || !to_master_ptr)
return 0; return 0;
#ifdef USE_CYGSERVER
client_request_attach_tty req ((DWORD) get_ttyp ()->master_pid, client_request_attach_tty req ((DWORD) get_ttyp ()->master_pid,
(HANDLE) get_ttyp ()->from_master, (HANDLE) get_ttyp ()->from_master,
(HANDLE) get_ttyp ()->to_master); (HANDLE) get_ttyp ()->to_master);
@ -609,9 +610,9 @@ fhandler_tty_slave::cygserver_attach_tty (LPHANDLE from_master_ptr,
*from_master_ptr = req.from_master (); *from_master_ptr = req.from_master ();
*to_master_ptr = req.to_master (); *to_master_ptr = req.to_master ();
#endif
return 1; return 1;
#endif
} }
void void