diff options
| author | Christopher Faylor <me@cgf.cx> | 2011-10-22 16:26:30 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2011-10-22 16:26:30 +0000 |
| commit | 6ae28c22639d43de76a9d45362df5055cd38a867 (patch) | |
| tree | 1d68d36140425f822ed1ad4485051f25b9f71114 /winsup/cygwin/fhandler.cc | |
| parent | bdea9e5fe8cb19d89015d8a6543ecab4b9e76a01 (diff) | |
| download | cygnal-6ae28c22639d43de76a9d45362df5055cd38a867.tar.gz cygnal-6ae28c22639d43de76a9d45362df5055cd38a867.tar.bz2 cygnal-6ae28c22639d43de76a9d45362df5055cd38a867.zip | |
* dtable.cc (dtable::delete_archetype): Improve debugging output.
(dtable::init_std_file_from_handle): Close console handle early, before
initialization. Build up openflags for passing to open_setup, just to be safe.
(last_tty_dev): New variable.
(fh_last_tty_dev): New macro.
(fh_alloc): Try again to keep track of previously opened tty, this time by just
saving the device and using that to potentially open an archetype. Avoid
setting the "/dev/tty" name if the creation of the fhandler failed.
(build_fh_pc): Remove unused second argument. Reorganize how and where the
name is set. Set last_tty_dev as appropriate. Avoid a NULL dereference in a
debug printf.
* dtable.h (build_fh_pc): Reflect removal of second parameter.
* fhandler.cc (fhandler_base::reset): Use new '<<' operator to copy pc since it
preserves any potentially previously set name.
(fhandler_base::set_name): Ditto.
* fhandler.h (fhandler_*::clone): Throughout use ccalloc to allocate new
fhandler, primarily to make sure that pc field is properly zeroed.
(fhandler_termios::last): Eliminate.
(fhandler_termios): Remove setting of last.
(fhandler_base::~fhandler_termios): Ditto.
* fhandler_console.cc (fhandler_console::open): Don't make decisions about
opening close-on-exec handles here since it makes no sense for archetypes.
(fhandler_console::init): Assume that input handle has already been opened.
* fhandler_termios.cc (fhandler_termios::last): Delete.
* path.h (path_conv::eq_worker): New function. Move bulk of operator = here.
(operator <<): New function.
(operator =): Use eq_worker to perform old functionality.
Diffstat (limited to 'winsup/cygwin/fhandler.cc')
| -rw-r--r-- | winsup/cygwin/fhandler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc index c9eb16cc8..e02f9611b 100644 --- a/winsup/cygwin/fhandler.cc +++ b/winsup/cygwin/fhandler.cc @@ -40,7 +40,7 @@ struct __cygwin_perfile *perfile_table; void fhandler_base::reset (const fhandler_base *from) { - pc = from->pc; + pc << from->pc; rabuf = NULL; ralen = 0; raixget = 0; @@ -148,7 +148,7 @@ fhandler_base::get_readahead_into_buffer (char *buf, size_t buflen) void fhandler_base::set_name (path_conv &in_pc) { - pc = in_pc; + pc << in_pc; } char *fhandler_base::get_proc_fd_name (char *buf) |