From b98ebf5470da68c0ab4a3877c453ac82c12974ae Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Sat, 28 Apr 2001 23:48:28 +0000 Subject: Throughout, change 'tty_attached' to 'real_tty_attached', for clarity. Throughout, change 'OutputStopped' to 'output_stopped', for consistency. * dtable.cc (stdio_init): Set controlling tty if not set by stdio opens. * exceptions.cc (ctrl_c_handler): Avoid special pgid checking if no tty is associated with the process. (Suggested by Tim Baker ) * external.cc (fillout_pinfo): Return actual tty number for ctty. * fhandler_console.cc (get_tty_stuff): Set ctty when shared memory is allocated. Accept flags input from open(). (set_console_ctty): New function. (fhandler_console::open): Pass flags to get_tty_stuff and rely on this function to set the ctty, if appropriate. * fhandler_termios.cc (fhandler_termios::set_ctty): Move to tty_min class. * fhandler_tty.cc (fhandler_tty_slave::open): Use tc field to access set_ctty(). * tty.h (TTY_CONSOLE): Move to include/sys/cygwin.h. (tty_min): Add set_ctty class here. * include/sys/cygwin.h (TTY_CONSOLE): New home here. * path.cc (symlink_info): Make contents an actual buffer. Pass more flags to case_check. (path_conv::check): Reorganize to do parsing based on posix path rather than native path. (symlink_info::check): Expect posix path as input. Translate to native path here. Accept path_conv flags. Stop parsing if not a symlink regardless of whether previous path was a symlink. --- winsup/cygwin/fhandler_termios.cc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'winsup/cygwin/fhandler_termios.cc') diff --git a/winsup/cygwin/fhandler_termios.cc b/winsup/cygwin/fhandler_termios.cc index 6d4e4e9a8..058410d9d 100644 --- a/winsup/cygwin/fhandler_termios.cc +++ b/winsup/cygwin/fhandler_termios.cc @@ -82,28 +82,28 @@ fhandler_termios::tcgetpgrp () } void -fhandler_termios::set_ctty (int ttynum, int flags) +tty_min::set_ctty (int ttynum, int flags) { if ((myself->ctty < 0 || myself->ctty == ttynum) && !(flags & O_NOCTTY)) { myself->ctty = ttynum; syscall_printf ("attached tty%d sid %d, pid %d, tty->pgid %d, tty->sid %d", - ttynum, myself->sid, myself->pid, tc->pgid, tc->getsid ()); + ttynum, myself->sid, myself->pid, pgid, getsid ()); - pinfo p (tc->getsid ()); + pinfo p (getsid ()); if (myself->sid == myself->pid && (p == myself || !proc_exists (p))) { paranoid_printf ("resetting tty%d sid. Was %d, now %d. pgid was %d, now %d.", - ttynum, tc->getsid(), myself->sid, tc->getpgid (), myself->pgid); + ttynum, getsid(), myself->sid, getpgid (), myself->pgid); /* We are the session leader */ - tc->setsid (myself->sid); - tc->setpgid (myself->pgid); + setsid (myself->sid); + setpgid (myself->pgid); } else - myself->sid = tc->getsid (); - if (tc->getpgid () == 0) - tc->setpgid (myself->pgid); + myself->sid = getsid (); + if (getpgid () == 0) + setpgid (myself->pgid); } } @@ -220,9 +220,9 @@ fhandler_termios::line_edit (const char *rptr, int nread, int always_accept) { if (c == tc->ti.c_cc[VSTOP]) { - if (!tc->OutputStopped) + if (!tc->output_stopped) { - tc->OutputStopped = 1; + tc->output_stopped = 1; acquire_output_mutex (INFINITE); } continue; @@ -230,11 +230,11 @@ fhandler_termios::line_edit (const char *rptr, int nread, int always_accept) else if (c == tc->ti.c_cc[VSTART]) { restart_output: - tc->OutputStopped = 0; + tc->output_stopped = 0; release_output_mutex (); continue; } - else if ((tc->ti.c_iflag & IXANY) && tc->OutputStopped) + else if ((tc->ti.c_iflag & IXANY) && tc->output_stopped) goto restart_output; } if (tc->ti.c_lflag & IEXTEN && c == tc->ti.c_cc[VDISCARD]) -- cgit v1.2.3