diff options
| author | Christopher Faylor <me@cgf.cx> | 2011-10-20 18:02:54 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2011-10-20 18:02:54 +0400 |
| commit | 38d732a152ff27601b385c00e6574111461b65c4 (patch) | |
| tree | ce60ae6b1ad6b8ca6e1d71d10cddaffebbf62ab2 /winsup/cygwin/ioctl.cc | |
| parent | aa982024d14f9d6c4afe8ada89e5a46585623102 (diff) | |
Throughout change TTY_* to PTY_*, tty_* to pty_*, and ttym_* to ptmx_*.
* devices.cc: Regenerate.
* dtable.cc: (fh_alloc): Preserve /dev/tty name when that's what we opened.
(build_fh_pc): Preserve any existing name.
* fhandler.cc (fhandler_base::open_with_arch): Ditto.
* fhandler_tty.cc (fhandler_pty_master::fhandler_pty_master): Force the name to
/dev/ptmx while preserving other pty master device information.
* path.h (cfree_maybe): New macro.
(path_conv::operator =): Free any allocated strings in target.
(path_conv::free_strings): Delete unused function.
* sigproc.cc (proc_terminate): Remove previous accommodation for execed
processes since it didn't have the desired effect. Change comment to a FIXME.
* spawn.cc (chExeced): Mark NO_COPY.
(exe_suffixes): Ditto.
Diffstat (limited to 'winsup/cygwin/ioctl.cc')
| -rw-r--r-- | winsup/cygwin/ioctl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/winsup/cygwin/ioctl.cc b/winsup/cygwin/ioctl.cc index ffcdbded4..02d454812 100644 --- a/winsup/cygwin/ioctl.cc +++ b/winsup/cygwin/ioctl.cc @@ -38,7 +38,7 @@ ioctl (int fd, int cmd, ...) /* 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) + if (cfd->is_tty () && cfd->get_major () != DEV_PTYM_MAJOR) switch (cmd) { case TCGETA: |