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

* cygwin.din: Remove some _tc* exports. Add tcgetsid().

Browse Source 
* dtable.cc (fh_alloc): Revert ill-advised setting of major/minor.  Use new
is_dev_tty to remember that this device was opened as /dev/tty.
* fhandler.cc (fhandler_base::fstat): Remove leftover debugging statement.
(fhandler_base::tcgetsid): New function.
* fhandler.h ((fhandler_base::tcgetsid): Declare new function.
(fhandler_base::is_dev_tty): Ditto.
(fhandler_termios::opened_as_dev_tty): Declare new field.
(fhandler_termios::is_dev_tty): Declare new function.
(fhandler_termios::tcgetsid): Ditto.
(fhandler_pty_common::use_archetype): Move here from subclass.
(fhandler_pty_slave::use_archetype): Move up.
(fhandler_pty_master::use_archetype): Ditto.
* fhandler_console.cc (fhandler_console::ioctl): Rename second argument from
`buf' to `arg' for consistency.  Call ioctl_termios for common fhandler_termios
ioctl handling.
* fhandler_tty.cc (fhandler_pty_slave::ioctl): Call ioctl_termios for common
fhandler_termios ioctl handling.
(fhandler_pty_master::ioctl): Ditto.
* fhandler_termios.cc (fhandler_termios::tcgetsid): Implement new function.
(fhandler_termios::ioctl_termios): Ditto.  Implements TIOCSCTTY handling.
* syscalls.cc (stat_worker): Set /dev/tty device info when appropriate.
* termios.cc (tcgetpgrp): Avoid extraneous "isatty" check.
(tcgetsid): Implement new function.
* include/cygwin/version.h: Bump CYGWIN_VERSION_API_MINOR to 253.
* include/sys/termios.h (TIOCSCTTY): Define.
This commit is contained in:
Christopher Faylor
2011-10-11 23:20:38 +00:00
parent 14b9008cca
commit 4add6f8db1
12 changed files with 132 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
winsup/cygwin/fhandler_console.cc
View File

@@ -839,8 +839,11 @@ fhandler_console::close ()
}
int
fhandler_console::ioctl (unsigned int cmd, void *buf)
fhandler_console::ioctl (unsigned int cmd, void *arg)
{
int res = ioctl_termios (cmd, (int) arg);
if (res <= 0)
return res;
switch (cmd)
{
case TIOCGWINSZ:
@@ -851,11 +854,11 @@ fhandler_console::ioctl (unsigned int cmd, void *buf)
{
/* *not* the buffer size, the actual screen size... */
/* based on Left Top Right Bottom of srWindow */
((struct winsize *) buf)->ws_row = dev_state.info.dwWinSize.Y;
((struct winsize *) buf)->ws_col = dev_state.info.dwWinSize.X;
((struct winsize *) arg)->ws_row = dev_state.info.dwWinSize.Y;
((struct winsize *) arg)->ws_col = dev_state.info.dwWinSize.X;
syscall_printf ("WINSZ: (row=%d,col=%d)",
((struct winsize *) buf)->ws_row,
((struct winsize *) buf)->ws_col);
((struct winsize *) arg)->ws_row,
((struct winsize *) arg)->ws_col);
return 0;
}
else
@@ -869,12 +872,12 @@ fhandler_console::ioctl (unsigned int cmd, void *buf)
bg_check (SIGTTOU);
return 0;
case KDGKBMETA:
*(int *) buf = (dev_state.metabit) ? K_METABIT : K_ESCPREFIX;
*(int *) arg = (dev_state.metabit) ? K_METABIT : K_ESCPREFIX;
return 0;
case KDSKBMETA:
if ((int) buf == K_METABIT)
if ((int) arg == K_METABIT)
dev_state.metabit = TRUE;
else if ((int) buf == K_ESCPREFIX)
else if ((int) arg == K_ESCPREFIX)
dev_state.metabit = FALSE;
else
{
@@ -883,9 +886,9 @@ fhandler_console::ioctl (unsigned int cmd, void *buf)
}
return 0;
case TIOCLINUX:
if (*(unsigned char *) buf == 6)
if (*(unsigned char *) arg == 6)
{
*(unsigned char *) buf = (unsigned char) dev_state.nModifiers;
*(unsigned char *) arg = (unsigned char) dev_state.nModifiers;
return 0;
}
set_errno (EINVAL);
@@ -906,13 +909,13 @@ fhandler_console::ioctl (unsigned int cmd, void *buf)
while (n-- > 0)
if (inp[n].EventType == KEY_EVENT && inp[n].Event.KeyEvent.bKeyDown)
++ret;
*(int *) buf = ret;
*(int *) arg = ret;
return 0;
}
break;
}
return fhandler_base::ioctl (cmd, buf);
return fhandler_base::ioctl (cmd, arg);
}
int