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

* fhandler.h (fhandler_tty_master::fixup_after_fork): Remove declaration. 

(fhandler_tty_master::fixup_after_exec): Ditto.
* fhandler_tty.cc (fhandler_tty_master::init): Fix so that children do not
inherit master tty handles.
(fhandler_tty_master::fixup_after_fork): Remove, since it was never used.
(fhandler_tty_master::fixup_after_exec): Ditto.
* pinfo.cc (_pinfo::set_ctty): Increment open_fhs when ctty is set.
* cygheap.cc (cygheap_init): Ditto.
* syscalls.cc (setsid): *Always* call close on opened ctty since the archetype
is associated with the ctty and it counts as an opened handle.
* tty.cc (tty::common_init): Don't protect input/output mutex since it confuses
subsequent fork/execs when CYGWIN=tty.
This commit is contained in:
Christopher Faylor 2003-12-27 01:59:29 +00:00
parent 56b5feb639
commit 1df3fbe2db
8 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,21 @@
2003-12-26 Christopher Faylor <cgf@redhat.com>
* fhandler.h (fhandler_tty_master::fixup_after_fork): Remove
declaration.
(fhandler_tty_master::fixup_after_exec): Ditto.
* fhandler_tty.cc (fhandler_tty_master::init): Fix so that children do
not inherit master tty handles.
(fhandler_tty_master::fixup_after_fork): Remove, since it was never
used.
(fhandler_tty_master::fixup_after_exec): Ditto.
* pinfo.cc (_pinfo::set_ctty): Increment open_fhs when ctty is set.
* cygheap.cc (cygheap_init): Ditto.
* syscalls.cc (setsid): *Always* call close on opened ctty since the
archetype is associated with the ctty and it counts as an opened
handle.
* tty.cc (tty::common_init): Don't protect input/output mutex since it
confuses subsequent fork/execs when CYGWIN=tty.
2003-12-26 Christopher Faylor <cgf@redhat.com>
* exceptions.cc (try_to_debug): Fix off-by-one problem when resetting

7
winsup/cygwin/cygheap.cc
View File

@ -212,6 +212,13 @@ cygheap_init ()
&& (set_process_privilege (SE_CREATE_GLOBAL_NAME, true) >= 0
|| GetLastError () == ERROR_NO_SUCH_PRIVILEGE)
? "Global\\" : "");
if (cygheap->ctty)
{
fhandler_console::open_fhs++;
debug_printf ("tty%d, open_fhs %d, arch usecount %d",
cygheap->ctty->get_ttyp ()->ntty,
fhandler_console::open_fhs, cygheap->ctty->usecount);
}
}
/* Copyright (C) 1997, 2000 DJ Delorie */

4
winsup/cygwin/fhandler.h
View File

@ -890,7 +890,7 @@ class fhandler_tty_common: public fhandler_termios
virtual int dup (fhandler_base *child);
tty *get_ttyp () { return (tty *)tc; }
tty *get_ttyp () { return (tty *) tc; }
int close ();
void set_close_on_exec (int val);
@ -969,8 +969,6 @@ class fhandler_tty_master: public fhandler_pty_master
int init ();
int init_console ();
void set_winsize (bool);
void fixup_after_fork (HANDLE parent);
void fixup_after_exec (HANDLE);
bool is_slow () {return 1;}
};

15
winsup/cygwin/fhandler_tty.cc
View File

@ -78,6 +78,7 @@ fhandler_tty_master::init ()
set_winsize (false);
inuse = get_ttyp ()->create_inuse (TTY_MASTER_ALIVE);
set_close_on_exec (true);
cygthread *h;
h = new cygthread (process_input, cygself, "ttyin");
@ -1402,20 +1403,6 @@ fhandler_pty_master::set_close_on_exec (int val)
}
}
void
fhandler_tty_master::fixup_after_fork (HANDLE child)
{
fhandler_pty_master::fixup_after_fork (child);
console->fixup_after_fork (child);
}
void
fhandler_tty_master::fixup_after_exec (HANDLE)
{
console->close ();
init_console ();
}
int
fhandler_tty_master::init_console ()
{

4
winsup/cygwin/pinfo.cc
View File

@ -293,7 +293,9 @@ _pinfo::set_ctty (tty_min *tc, int flags, fhandler_tty_slave *arch)
if (arch)
{
arch->usecount++;
debug_printf ("arch usecount for tty%d is %d", tc->ntty, arch->usecount);
fhandler_console::open_fhs++;
debug_printf ("tty%d, open_fhs %d, arch usecount %d", tc->ntty,
fhandler_console::open_fhs, arch->usecount);
}
}
}

3
winsup/cygwin/syscalls.cc
View File

@ -335,8 +335,7 @@ setsid (void)
myself->pgid, myself->ctty, fhandler_console::open_fhs);
if (cygheap->ctty)
{
if (cygheap->ctty->usecount == 1)
cygheap->ctty->close ();
cygheap->ctty->close ();
cygheap->ctty = NULL;
}
return myself->sid;

4
winsup/cygwin/tty.cc
View File

@ -457,8 +457,8 @@ tty::common_init (fhandler_pty_master *ptym)
return false;
}
ProtectHandle1INH (ptym->output_mutex, output_mutex);
ProtectHandle1INH (ptym->input_mutex, input_mutex);
// /* screws up tty master */ ProtectHandle1INH (ptym->output_mutex, output_mutex);
// /* screws up tty master */ ProtectHandle1INH (ptym->input_mutex, input_mutex);
winsize.ws_col = 80;
winsize.ws_row = 25;

2
winsup/cygwin/tty.h
View File

@ -87,7 +87,7 @@ class fhandler_pty_master;
class tty: public tty_min
{
HANDLE get_event (const char *fmt, BOOL manual_reset = FALSE)
__attribute__ ((regparm (2)));
__attribute__ ((regparm (3)));
public:
HWND hwnd; /* Console window handle tty belongs to */