--- rxvt-unicode/src/ptytty.C 2004/12/12 05:54:05 1.18 +++ rxvt-unicode/src/ptytty.C 2006/01/17 11:53:07 1.38 @@ -4,7 +4,7 @@ * * All portions of code are copyright by their respective author/s. * Copyright (c) 1999-2001 Geoff Wing - * Copyright (c) 2004 Marc Lehmann + * Copyright (c) 2004-2006 Marc Lehmann * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,18 +24,15 @@ #include "../config.h" /* NECESSARY */ #include "rxvt.h" -#ifdef HAVE_STDLIB_H # include -#endif +# include + #ifdef HAVE_SYS_TYPES_H # include #endif #ifdef HAVE_UNISTD_H # include #endif -#if defined(HAVE_STRING_H) -# include -#endif #ifdef HAVE_FCNTL_H # include #endif @@ -48,17 +45,19 @@ #ifdef HAVE_ISASTREAM # include #endif - -// better do this via configure, but.... -#if defined(__FreeBSD__) +#if defined(HAVE_PTY_H) +# include +#elif defined(HAVE_LIBUTIL_H) # include -#elif defined(__DARWIN__) || (defined (__MACH__) && defined (__APPLE__)) +#elif defined(HAVE_UTIL_H) # include #endif #include #include +///////////////////////////////////////////////////////////////////////////// + /* ------------------------------------------------------------------------- * * GET PSEUDO TELETYPE - MASTER AND SLAVE * * ------------------------------------------------------------------------- */ @@ -75,7 +74,11 @@ #ifdef PTYS_ARE_OPENPTY char tty_name[sizeof "/dev/pts/????\0"]; - if (openpty (&pfd, fd_tty, tty_name, NULL, NULL) != -1) + rxvt_privileges(RESTORE); + int res = openpty (&pfd, fd_tty, tty_name, NULL, NULL); + rxvt_privileges(IGNORE); + + if (res != -1) { *ttydev = strdup (tty_name); return pfd; @@ -88,27 +91,19 @@ return pfd; #endif -#ifdef PTYS_ARE_GETPTY - - char *ptydev; - - while ((ptydev = getpty ()) != NULL) - if ((pfd = open (ptydev, O_RDWR | O_NOCTTY, 0)) >= 0) - { - *ttydev = ptydev; - return pfd; - } -#endif - #if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT) -# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX) +# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_POSIX) || defined(PTYS_ARE_PTMX) { # ifdef PTYS_ARE_GETPT - pfd = getpt (); + pfd = getpt(); +# else +# ifdef PTYS_ARE_POSIX + pfd = posix_openpt (O_RDWR); # else pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0); # endif +# endif if (pfd >= 0) { @@ -227,38 +222,15 @@ * Make our tty a controlling tty so that /dev/tty points to us */ static int -control_tty (int fd_tty, const char *ttydev) +control_tty (int fd_tty) { -#ifndef __QNX__ int fd; /* ---------------------------------------- */ -# ifdef HAVE_SETSID setsid (); -# endif -# if defined(HAVE_SETPGID) - setpgid (0, 0); -# elif defined(HAVE_SETPGRP) - setpgrp (0, 0); -# endif - - /* ---------------------------------------- */ -# ifdef TIOCNOTTY - fd = open ("/dev/tty", O_RDWR | O_NOCTTY); - if (fd >= 0) - { - ioctl (fd, TIOCNOTTY, NULL); /* void tty associations */ - close (fd); - } -# endif - - /* ---------------------------------------- */ - fd = open ("/dev/tty", O_RDWR | O_NOCTTY); - if (fd >= 0) - close (fd); /* ouch: still have controlling tty */ /* ---------------------------------------- */ -#if defined(PTYS_ARE_PTMX) && defined(I_PUSH) +# if defined(PTYS_ARE_PTMX) && defined(I_PUSH) /* * Push STREAMS modules: * ptem: pseudo-terminal hardware emulation module. @@ -276,36 +248,72 @@ * close () - on the master side which causes a hang up to be sent * through - Geoff Wing */ -# ifdef HAVE_ISASTREAM +# ifdef HAVE_ISASTREAM if (isastream (fd_tty) == 1) -# endif +# endif { ioctl (fd_tty, I_PUSH, "ptem"); ioctl (fd_tty, I_PUSH, "ldterm"); ioctl (fd_tty, I_PUSH, "ttcompat"); } -#endif +# endif /* ---------------------------------------- */ -# if defined(TIOCSCTTY) fd = ioctl (fd_tty, TIOCSCTTY, NULL); -# elif defined(TIOCSETCTTY) - fd = ioctl (fd_tty, TIOCSETCTTY, NULL); -# else - fd = open (ttydev, O_RDWR); - if (fd >= 0) - close (fd); -# endif /* ---------------------------------------- */ fd = open ("/dev/tty", O_WRONLY); if (fd < 0) return -1; /* fatal */ close (fd); /* ---------------------------------------- */ -#endif /* ! __QNX__ */ return 0; } +void +rxvt_ptytty::close_tty () +{ + if (tty < 0) + return; + + close (tty); + tty = -1; +} + +bool +rxvt_ptytty::make_controlling_tty () +{ + return control_tty (tty) >= 0; +} + +void +rxvt_ptytty::set_utf8_mode (bool on) +{ +#ifdef IUTF8 + if (pty < 0) + return; + + struct termios tio; + + if (tcgetattr (pty, &tio) != -1) + { + tcflag_t new_cflag = tio.c_iflag; + + if (on) + new_cflag |= IUTF8; + else + new_cflag &= ~IUTF8; + + if (new_cflag != tio.c_iflag) + { + tio.c_iflag = new_cflag; + tcsetattr (pty, TCSANOW, &tio); + } + } +#endif +} + +///////////////////////////////////////////////////////////////////////////// + #ifndef NO_SETOWNER_TTYDEV static struct ttyconf { gid_t gid; @@ -330,36 +338,41 @@ } } ttyconf; +///////////////////////////////////////////////////////////////////////////// + void -rxvt_ptytty::privileges (rxvt_privaction action) +rxvt_ptytty_unix::privileges (rxvt_privaction action) { + if (!name || !*name) + return; + rxvt_privileges (RESTORE); if (action == SAVE) { - //next_tty_action = RESTORE; # ifndef RESET_TTY_TO_COMMON_DEFAULTS /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */ if (lstat (name, &savestat) < 0) /* you lose out */ - ;//next_tty_action = IGNORE; + ; else # endif - { + saved = true; chown (name, getuid (), ttyconf.gid); /* fail silently */ chmod (name, ttyconf.mode); # ifdef HAVE_REVOKE revoke (name); # endif - } } else { /* action == RESTORE */ - //next_tty_action = IGNORE; # ifndef RESET_TTY_TO_COMMON_DEFAULTS - chmod (name, savestat.st_mode); - chown (name, savestat.st_uid, savestat.st_gid); + if (saved) + { + chmod (name, savestat.st_mode); + chown (name, savestat.st_uid, savestat.st_gid); + } # else chmod (name, (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); chown (name, 0, 0); @@ -371,31 +384,29 @@ } #endif -rxvt_ptytty::rxvt_ptytty () +rxvt_ptytty_unix::rxvt_ptytty_unix () { pty = tty = -1; name = 0; +#ifndef NO_SETOWNER_TTYDEV + saved = false; +#endif +#if UTMP_SUPPORT + cmd_pid = 0; +#endif } -rxvt_ptytty::~rxvt_ptytty () +rxvt_ptytty_unix::~rxvt_ptytty_unix () { + logout (); put (); } void - -rxvt_ptytty::close_tty () -{ - if (tty >= 0) close (tty); - tty = -1; -} - -void -rxvt_ptytty::put () +rxvt_ptytty_unix::put () { #ifndef NO_SETOWNER_TTYDEV - if (tty >= 0) - privileges (RESTORE); + privileges (RESTORE); #endif if (pty >= 0) close (pty); @@ -407,13 +418,7 @@ } bool -rxvt_ptytty::make_controlling_tty () -{ - return control_tty (tty, name) >= 0; -} - -bool -rxvt_ptytty::get () +rxvt_ptytty_unix::get () { /* get master (pty) */ if ((pty = get_pty (&tty, &name)) < 0)