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

Rename FH_BAD to FH_NADA throughout.

Browse Source 
* devices.h (FH_ERROR): New value.
(iscons_dev): Extend to detect all the console device types.
* devices.in: Set aside storage for FH_ERROR.
* dtable.cc (dtable::init_std_file_from_handle): Use iscons_dev to detect when
device is a console.
(fh_alloc): Pass device to console constructor.
(build_fh_pc): Short circuit when we detect that the constructor saw an error.
* fhandler.h (fhandler_console::fhandler_console): Accept fh_devices parameter.
(get_tty_stuff): Change to void.
* fhandler_console (fhandler_console::set_unit): Set device to FH_ERROR on
attempt to access anything other than the current console.
(fhandler_console::get_tty_stuff): Change to void return.
(fhandler_console::open): Return EPERM on FH_ERROR device type.
(fhandler_console::fhandler_console): Set the device type appropriately before
calling get_tty_stuff and rely on that function to reset it if necessary.
This commit is contained in:
Christopher Faylor
2011-06-12 20:15:26 +00:00
parent 38e356f0e4
commit c3a9063f83
13 changed files with 79 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
winsup/cygwin/fhandler_console.cc
View File

@ -131,8 +131,18 @@ bool
fhandler_console::set_unit ()
{
bool created;
fh_devices devset;
if (shared_console_info)
created = false;
{
fh_devices this_unit = dev ();
fh_devices shared_unit =
(fh_devices) shared_console_info->tty_min_state.getntty ();
created = false;
devset = (shared_unit == this_unit || this_unit == FH_CONSOLE
|| this_unit == FH_CONIN || this_unit == FH_CONOUT
|| this_unit == FH_TTY) ?
shared_unit : FH_ERROR;
}
else
{
HWND me = GetConsoleWindow ();
@ -144,14 +154,15 @@ fhandler_console::set_unit ()
lock_ttys here;
shared_console_info->tty_min_state.setntty (DEV_CONS_MAJOR, console_unit (me));
}
devset = (fh_devices) shared_console_info->tty_min_state.getntty ();
}
dev ().parse (devset);
return created;
}
/* Allocate and initialize the shared record for the current console.
Returns a pointer to shared_console_info. */
tty_min *
/* Allocate and initialize the shared record for the current console. */
void
fhandler_console::get_tty_stuff ()
{
if (set_unit ())
@ -182,8 +193,6 @@ fhandler_console::get_tty_stuff ()
dev_state.backspace_keycode = CERASE;
shared_console_info->tty_min_state.sethwnd ((HWND) INVALID_HANDLE_VALUE);
}
return &shared_console_info->tty_min_state;
}
/* Return the tty structure associated with a given tty number. If the
@ -756,6 +765,12 @@ fhandler_console::open (int flags, mode_t)
{
HANDLE h;
if (dev () == FH_ERROR)
{
set_errno (EPERM); /* constructor found an error */
return 0;
}
tcinit (false);
set_io_handle (NULL);
@ -1033,11 +1048,12 @@ fhandler_console::tcgetattr (struct termios *t)
return res;
}
fhandler_console::fhandler_console () :
fhandler_console::fhandler_console (fh_devices unit) :
fhandler_termios ()
{
if (unit > 0)
dev ().parse (unit);
get_tty_stuff ();
dev ().parse (shared_console_info->tty_min_state.getntty ());
trunc_buf.len = 0;
}