diff options
| author | Christopher Faylor <me@cgf.cx> | 2006-06-05 00:32:58 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2006-06-05 00:32:58 +0400 |
| commit | c0ac34fda03d4e1691035f13615fdcaa10af94e5 (patch) | |
| tree | c7bef32a7af0beebbb7b6643943d7c7ac8001178 /winsup/cygwin/ioctl.cc | |
| parent | e73b03adcca4543c0ecde8603d9f51dbd5b1f5de (diff) | |
* ioctl.cc (ioctl): Accommodate change in reported pty master device number.
* select.cc (peek_pipe): Ditto.
Diffstat (limited to 'winsup/cygwin/ioctl.cc')
| -rw-r--r-- | winsup/cygwin/ioctl.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/winsup/cygwin/ioctl.cc b/winsup/cygwin/ioctl.cc index bd9b3ca3c..62e533678 100644 --- a/winsup/cygwin/ioctl.cc +++ b/winsup/cygwin/ioctl.cc @@ -1,6 +1,6 @@ /* ioctl.cc: ioctl routines. - Copyright 1996, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc. + Copyright 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2006 Red Hat, Inc. Written by Doug Evans of Cygnus Support dje@cygnus.com @@ -38,7 +38,10 @@ ioctl (int fd, int cmd, ...) debug_printf ("fd %d, cmd %x", fd, cmd); int res; - if (cfd->is_tty () && cfd->get_device () != FH_PTYM) + /* FIXME: This stinks. There are collisions between cmd types + depending on whether fd is associated with a pty master or not. + Something to fix for Cygwin2. CGF 2006-06-04 */ + if (cfd->is_tty () && cfd->get_major () != DEV_TTYM_MAJOR) switch (cmd) { case TCGETA: |