diff options
| author | Christopher Faylor <me@cgf.cx> | 2011-10-20 14:02:54 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2011-10-20 14:02:54 +0000 |
| commit | 38d732a152ff27601b385c00e6574111461b65c4 (patch) | |
| tree | ce60ae6b1ad6b8ca6e1d71d10cddaffebbf62ab2 /winsup/cygwin/devices.h | |
| parent | aa982024d14f9d6c4afe8ada89e5a46585623102 (diff) | |
| download | cygnal-38d732a152ff27601b385c00e6574111461b65c4.tar.gz cygnal-38d732a152ff27601b385c00e6574111461b65c4.tar.bz2 cygnal-38d732a152ff27601b385c00e6574111461b65c4.zip | |
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/devices.h')
| -rw-r--r-- | winsup/cygwin/devices.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/winsup/cygwin/devices.h b/winsup/cygwin/devices.h index 542c122b4..96eaa3ec4 100644 --- a/winsup/cygwin/devices.h +++ b/winsup/cygwin/devices.h @@ -33,13 +33,13 @@ enum fh_devices FH_CONS = FHDEV (DEV_CONS_MAJOR, 0), FH_CONS_MAX = FHDEV (DEV_CONS_MAJOR, MAX_CONSOLES), - DEV_TTYM_MAJOR = 128, - FH_TTYM = FHDEV (DEV_TTYM_MAJOR, 0), - FH_TTYM_MAX= FHDEV (DEV_TTYM_MAJOR, 255), + DEV_PTYM_MAJOR = 128, + FH_PTYM = FHDEV (DEV_PTYM_MAJOR, 0), + FH_PTYM_MAX= FHDEV (DEV_PTYM_MAJOR, 255), - DEV_TTYS_MAJOR = 136, - FH_TTYS = FHDEV (DEV_TTYS_MAJOR, 0), /* FIXME: Should separate ttys and ptys */ - FH_TTYS_MAX= FHDEV (DEV_TTYS_MAJOR, 255), /* FIXME: Should separate ttys and ptys */ + DEV_PTYS_MAJOR = 136, + FH_PTYS = FHDEV (DEV_PTYS_MAJOR, 0), /* FIXME: Should separate ttys and ptys */ + FH_PTYS_MAX= FHDEV (DEV_PTYS_MAJOR, 255), /* FIXME: Should separate ttys and ptys */ DEV_SERIAL_MAJOR = 117, FH_SERIAL = FHDEV (117, 0), /* /dev/ttyS? */ @@ -317,8 +317,8 @@ struct device }; extern const device *console_dev; -extern const device *ttym_dev; -extern const device *ttys_dev; +extern const device *ptmx_dev; +extern const device *ptys_dev; extern const device *urandom_dev; extern const device dev_dgram_storage; @@ -359,5 +359,5 @@ extern const device dev_fs_storage; || (((int) n) == FH_CONIN) \ || (((int) n) == FH_CONOUT)) -#define istty_slave_dev(n) (device::major (n) == DEV_TTYS_MAJOR) +#define istty_slave_dev(n) (device::major (n) == DEV_PTYS_MAJOR) #endif /*_DEVICES_H*/ |