diff options
| -rw-r--r-- | winsup/cygwin/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_tty.cc | 15 |
2 files changed, 6 insertions, 15 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index a971b0ff3..aa8a993b9 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,9 @@ +2011-07-10 Christopher Faylor <me.cygwin2011@cgf.cx> + + * fhandler_tty.cc (fhandler_pty_slave::ioctl): Remove erroneous support + for TIOCLINUX for pty. Get rid of unneeded EINVAL handling in wake of + tty removal. Remove now-unneeded variable. + 2011-07-10 Corinna Vinschen <corinna@vinschen.de> * include/netdb.h (gethostbyname2): Declare. diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc index 3a08ca357..b1dd96275 100644 --- a/winsup/cygwin/fhandler_tty.cc +++ b/winsup/cygwin/fhandler_tty.cc @@ -959,9 +959,6 @@ fhandler_pty_slave::ioctl (unsigned int cmd, void *arg) { case TIOCGWINSZ: case TIOCSWINSZ: - case TIOCLINUX: - case KDGKBMETA: - case KDSKBMETA: break; case FIONBIO: set_nonblocking (*(int *) arg); @@ -991,7 +988,6 @@ fhandler_pty_slave::ioctl (unsigned int cmd, void *arg) get_ttyp ()->cmd = cmd; get_ttyp ()->ioctl_retval = 0; - int val; switch (cmd) { case TIOCGWINSZ: @@ -1008,17 +1004,6 @@ fhandler_pty_slave::ioctl (unsigned int cmd, void *arg) killsys (-get_ttyp ()->getpgid (), SIGWINCH); } break; - case TIOCLINUX: - val = *(unsigned char *) arg; - if (val != 6) - get_ttyp ()->ioctl_retval = -EINVAL; - break; - case KDGKBMETA: - get_ttyp ()->ioctl_retval = -EINVAL; - break; - case KDSKBMETA: - get_ttyp ()->ioctl_retval = -EINVAL; - break; } release_output_mutex (); |