CVSROOT: /cvs/uberbaum
Module name: winsup
Changes by: [email protected] 2011-10-15 22:37:30
Modified files:
cygwin : ChangeLog cygerrno.h devices.cc devices.h
devices.in dtable.cc fhandler.cc fhandler.h
fhandler_clipboard.cc fhandler_console.cc
fhandler_disk_file.cc fhandler_fifo.cc
fhandler_floppy.cc fhandler_proc.cc
fhandler_random.cc fhandler_raw.cc
fhandler_registry.cc fhandler_serial.cc
fhandler_socket.cc fhandler_tape.cc
fhandler_termios.cc fhandler_tty.cc
fhandler_virtual.cc path.cc path.h pinfo.cc
pinfo.h pipe.cc syscalls.cc tty.cc tty.h
Log message:
* cygerrno.h (__set_errno): Modify debugging output to make searching
strace
logs easier. Throughout, change /dev/tty* to /dev/pty*. Throughout,
add flags
argument to fhandler_*::dup methods.
* devices.in: Rename (temporarily?) /dev/ttyN to /dev/ptyN. Add
/dev/ptymN
devices for pty masters.
* devices.cc: Regenerate.
* devices.h (MAX_CONSOLES): Set to max number supported by devices.in.
(fh_devices::FH_PTMX): Rename from FH_PTYM.
(device::operator int): Return by reference.
* dtable.cc (fh_alloc): Take pc as an argument rather than just the
device.
This makes debugging easier since more information is available.
Actually
implement handling for already-allocated pty master devices. Make
different
decisions when generating fhandler for not-opened devices. Add kludge
to deal
with opening /dev/tty.
(cnew_no_ctor): New macro.
(build_fh_pc): Make debugging output more verbose. Use new clone()
fhandler
interface to duplicate archetypes. Reset last term opened.
(dtable::dup_worker): Use Use new clone() fhandler interface to
duplicate
archetypes. Pass flags to child dup handler.
(dtable::dup3): Set O_NOCTTY flag if newfd is not stdin/stdout/stderr.
* fhandler.cc (fhandler_base::reset): Rename from operator =() and
reduce
functionality and sense of copy direction.
(fhandler_base::open_with_arch): Use published interface to query
io_handle().
Use new copyto() fhandler method to copy from/to found archetype.
* fhandler.h: Throughout, delete size(), add copyout, clone, and
fhandler_*
(void *) methods.
(fhandler_base::reset): Rename from operator =().
(fhandler_termios::is_dev_tty): Delete.
(fhandler_termios): change "protected" region to "private".
(fhandler_termios::is_dev_tty): Delete.
(fhandler_termios): Rearrange protected/public.
(fhandler_termios::fhandler_termios): Remember last fhandler_termios
"opened".
(fhandler_termios::~fhandler_termios): Forget last fhandler_termios
opened.
(ioctl): Rename from ioctl_termios. Take a void * argument. Reflect
argument
change in pinfo::set_ctty.
(fhandler_console::dup): Declare new function. Set ctty here if
appropriate.
(fhandler_pty_master::from_master): Privatize.
(fhandler_pty_master::to_master): Ditto.
(fhandler_pty_master::dwProcessId): Ditto.
(fhandler_pty_master::fhandler_pty_master): Add an `int' argument.
(fhandler_pty_master::open_setup): Declare new function.
(fhandler_pty_master::~fhandler_pty_master): Declare new method.
(fhandler_nodevice): Remove commented out function declaration.
* fhandler_console.cc: Use get_ttyp() instead of tc() throughout.
(fhandler_console::dup): Define new function to set controlling ctty on
dup, as
appropriate.
(fhandler_console::ioctl): Reflect ioctl_termios name change.
(fhandler_console::setup): Rename from get_tty_stuff.
(fhandler_console::open_setup): Reflect argument change in
pinfo::set_ctty.
(fhandler_console::fhandler_console): Set _tc here.
* fhandler_termios.cc (handler_termios::ioctl): Rename. Take a void *
arg like
other ioctl functions.
* fhandler_tty.cc (fhandler_pty_slave::dup): Call myself->set_ctty to
potentially reset the controlling terminal.
(fhandler_pty_slave::ioctl): Reflect name/arg change for ioctl_termios.
(fhandler_pty_slave::fhandler_pty_slave): Take a "unit" argument. Call
setup()
here so that we will know the unit number of this fhandler as soon as
possible.
Set the unit as appropriate.
(handler_pty_master::open): Move most stuff to constructor and
open_setup.
(handler_pty_slave::open_setup): Reflect argument change in
pinfo::set_ctty.
(handler_pty_master::open_setup): Define new function.
(fhandler_pty_master::cleanup): Clear handles as a flag that the
destructor
does not have to do "close" operations.
(fhandler_pty_master::close): Ditto.
(fhandler_pty_master::~fhandler_pty_master): Define new method.
(fhandler_pty_master::ioctl): Reflect name/arg change for ioctl_termios.
(fhandler_pty_master::setup): Allocate tty here. Rely on handles being
returned from allocated test rather than opening them here. Avoid
setting
_need_nl here since it is already zeroed in the constructor. Set up
device
information with DEV_TTYM_MAJOR.
* path.h (path_conv &operator =): Take a const argument.
(path_conv::dup): Ditto.
(pathconv_arg::PC_OPEN): New enum.
(pathconv_arg::PC_CTTY): Ditto.
(path_types::PATH_CTTY): Ditto.
(path_types::PATH_OPEN): Ditto.
(path_conv::isopen): New method.
(path_conv::isctty_capable): Ditto.
* path.cc (path_conv::check): Set PATH_OPEN and PATH_CTTY as
appropriate.
* pipe.cc (fhandler_pipe::open): Use copyto to copy pipe handle.
* syscall.cc (open): Reinstate fd > 2 check to disallow resetting ctty
on
non-std* handles.
* tty.cc (tty_list::allocate): Pass out handles for allocated tty. use
`not_allocated' to find unallocated ttys. Avoid keeping the lock since
the
allocation of the tty should be sufficient to prevent multiple access.
(tty::not_allocated): Clarify comment. Rename. Return handles when an
unused
tty is found. Simply test for existing tty.
(tty::exists): Rewrite to use `not_allocated'.
* tty.h (NTTYS): Reset down to actual number supported by devices.in.
(tty::not_allocated): Declare new function.
(tty_list::allocate): Pass out read/write tty handles. Zero them when
not
found.
* fhandler_proc.cc: Reflect name change from FH_PTYM -> FH_PTMX.
* pinfo.h (pinfo::set_ctty): Reduce/reorder arguments passed in.
* pinfo.cc (pinfo::set_ctty): Ditto. Just use tc() built into the
passed-in
fhandler_termios pointer. Return true if ctty is assigned.
* syscalls.cc (open): Call build_fh_pc with PC_OPEN flag. Set PC_CTTY
if
appropriate.
(stat_worker): Remove is_dev_tty () stuff.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/winsup/cygwin/ChangeLog.diff?cvsroot=uberbaum&r1=1.5521&r2=1.5522
http://sourceware.org/cgi-bin/cvsweb.cgi/winsup/cygwin/cygerrno.h.diff?cvsroot=uberbaum&r1=1.20&r2=1.21
http://sourceware.org/cgi-bin/cvsweb.cgi/winsup/cygwin/devices.cc.diff?cvsroot=uberbaum&r1=1.38&r2=1.39
http://sourceware.org/cgi-bin/cvsweb.cgi/winsup/cygwin/devices.h.diff?cvsroot=uberbaum&r1=1.33&r2=1.34
http://sourceware.org/cgi-bin/cvsweb.cgi/winsup/cygwin/devices.in.diff?cvsroot=uberbaum&r1=1.29&r2=1.30
http://sourceware.org/cgi-bin/cvsweb.cgi/winsup/cygwin/dtable.cc.diff?cvsroot=uberbaum&r1=1.235&r2=1.236
http://sourceware.org/cgi-bin/cvsweb.cgi/winsup/cygwin/fhandler.cc.diff?cvsroot=uberbaum&r1=1.401&r2=1.402
http://sourceware.org/cgi-bin/cvsweb.cgi/winsup/cygwin/fhandler.h.diff?cvsroot=uberbaum&r1=1.438&r2=1.439
http://sourceware.org/cgi-bin/cvsweb.cgi/winsup/cygwin/fhandler_clipboard.cc.diff?cvsroot=uberbaum&r1=1.47&r2=1.48
http://sourceware.org/cgi-bin/cvsweb.cgi/winsup/cygwin/fhandler_console.cc.diff?cvsroot=uberbaum&r1=1.251&r2=1.252
http://sourceware.org/cgi-bin/cvsweb.cgi/winsup/cygwin/fhandler_disk_file.cc.diff?cvsroot=uberbaum&r1=1.365&r2=1.366
http://sourceware.org/cgi-bin/cvsweb.cgi/winsup/cygwin/fhandler_fifo.cc.diff?cvsroot=uberbaum&r1=1.47&r2=1.48
http://sourceware.org/cgi-bin/cvsweb.cgi/winsup/cygwin/fhandler_floppy.cc.diff?cvsroot=uberbaum&r1=1.60&r2=1.61
http://sourceware.org/cgi-bin/cvsweb.cgi/winsup/cygwin/fhandler_proc.cc.diff?cvsroot=uberbaum&r1=1.111&r2=1.112
http://sourceware.org/cgi-bin/cvsweb.cgi/winsup/cygwin/fhandler_random.cc.diff?cvsroot=uberbaum&r1=1.41&r2=1.42
http://sourceware.org/cgi-bin/cvsweb.cgi/winsup/cygwin/fhandler_raw.cc.diff?cvsroot=uberbaum&r1=1.72&r2=1.73
http://sourceware.org/cgi-bin/cvsweb.cgi/winsup/cygwin/fhandler_registry.cc.diff?cvsroot=uberbaum&r1=1.67&r2=1.68
http://sourceware.org/cgi-bin/cvsweb.cgi/winsup/cygwin/fhandler_serial.cc.diff?cvsroot=uberbaum&r1=1.78&r2=1.79
http://sourceware.org/cgi-bin/cvsweb.cgi/winsup/cygwin/fhandler_socket.cc.diff?cvsroot=uberbaum&r1=1.281&r2=1.282
http://sourceware.org/cgi-bin/cvsweb.cgi/winsup/cygwin/fhandler_tape.cc.diff?cvsroot=uberbaum&r1=1.76&r2=1.77
http://sourceware.org/cgi-bin/cvsweb.cgi/winsup/cygwin/fhandler_termios.cc.diff?cvsroot=uberbaum&r1=1.89&r2=1.90
http://sourceware.org/cgi-bin/cvsweb.cgi/winsup/cygwin/fhandler_tty.cc.diff?cvsroot=uberbaum&r1=1.241&r2=1.242
http://sourceware.org/cgi-bin/cvsweb.cgi/winsup/cygwin/fhandler_virtual.cc.diff?cvsroot=uberbaum&r1=1.55&r2=1.56
http://sourceware.org/cgi-bin/cvsweb.cgi/winsup/cygwin/path.cc.diff?cvsroot=uberbaum&r1=1.635&r2=1.636
http://sourceware.org/cgi-bin/cvsweb.cgi/winsup/cygwin/path.h.diff?cvsroot=uberbaum&r1=1.159&r2=1.160
http://sourceware.org/cgi-bin/cvsweb.cgi/winsup/cygwin/pinfo.cc.diff?cvsroot=uberbaum&r1=1.279&r2=1.280
http://sourceware.org/cgi-bin/cvsweb.cgi/winsup/cygwin/pinfo.h.diff?cvsroot=uberbaum&r1=1.117&r2=1.118
http://sourceware.org/cgi-bin/cvsweb.cgi/winsup/cygwin/pipe.cc.diff?cvsroot=uberbaum&r1=1.132&r2=1.133
http://sourceware.org/cgi-bin/cvsweb.cgi/winsup/cygwin/syscalls.cc.diff?cvsroot=uberbaum&r1=1.593&r2=1.594
http://sourceware.org/cgi-bin/cvsweb.cgi/winsup/cygwin/tty.cc.diff?cvsroot=uberbaum&r1=1.88&r2=1.89
http://sourceware.org/cgi-bin/cvsweb.cgi/winsup/cygwin/tty.h.diff?cvsroot=uberbaum&r1=1.31&r2=1.32
