--- rxvt-unicode/src/ptytty.C 2006/01/06 05:37:59 1.30 +++ rxvt-unicode/src/ptytty.C 2007/12/11 21:49:12 1.68 @@ -1,10 +1,14 @@ -/*--------------------------------*-C-*---------------------------------* +// This file is part of libptytty. Do not make local modifications. +// http://software.schmorp.de/pkg/libptytty + +/*----------------------------------------------------------------------* * File: ptytty.C *----------------------------------------------------------------------* * * All portions of code are copyright by their respective author/s. * Copyright (c) 1999-2001 Geoff Wing * Copyright (c) 2004-2006 Marc Lehmann + * Copyright (c) 2006 Emanuele Giaquinta * * 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 @@ -21,206 +25,193 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. *---------------------------------------------------------------------*/ -#include "../config.h" /* NECESSARY */ -#include "rxvt.h" +#include "../config.h" + +#include "ptytty.h" + +#include +#include +#include + +#include +#include +#include -#ifdef HAVE_STDLIB_H -# include -#endif -#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 #ifdef HAVE_SYS_IOCTL_H # include #endif -#if defined(PTYS_ARE_PTMX) && defined(HAVE_SYS_STROPTS_H) +#if defined(HAVE_DEV_PTMX) && defined(HAVE_SYS_STROPTS_H) # include /* for I_PUSH */ #endif #ifdef HAVE_ISASTREAM # include #endif -#ifdef HAVE_PTY_H +#if defined(HAVE_PTY_H) # include -#endif - -// better do this via configure, but.... -#if defined(__FreeBSD__) +#elif defined(HAVE_LIBUTIL_H) # include -#elif defined(__DARWIN__) || (defined (__MACH__) && defined (__APPLE__)) +#elif defined(HAVE_UTIL_H) # include #endif +#ifdef TTY_GID_SUPPORT +#include +#endif #include -#include + +///////////////////////////////////////////////////////////////////////////// /* ------------------------------------------------------------------------- * * GET PSEUDO TELETYPE - MASTER AND SLAVE * * ------------------------------------------------------------------------- */ /* - * Returns pty file descriptor, or -1 on failure + * Returns pty file descriptor, or -1 on failure * If successful, ttydev is set to the name of the slave device. * fd_tty _may_ also be set to an open fd to the slave device */ -static int -get_pty (int *fd_tty, char **ttydev) -{ - int pfd; - -#ifdef PTYS_ARE_OPENPTY - char tty_name[sizeof "/dev/pts/????\0"]; - - 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; - } -#endif - -#ifdef PTYS_ARE__GETPTY - *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0); - if (*ttydev != NULL) - 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(UNIX98_PTY) + static int + get_pty (int *fd_tty, char **ttydev) { -# ifdef PTYS_ARE_GETPT - pfd = getpt (); -# else - pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0); -# endif + int pfd; + +# if defined(HAVE_GETPT) + pfd = getpt(); +# elif defined(HAVE_POSIX_OPENPT) + pfd = posix_openpt (O_RDWR); +# else + pfd = open (CLONE_DEVICE, O_RDWR | O_NOCTTY, 0); +# endif if (pfd >= 0) { if (grantpt (pfd) == 0 /* change slave permissions */ && unlockpt (pfd) == 0) - { /* slave now unlocked */ + { + /* slave now unlocked */ *ttydev = strdup (ptsname (pfd)); /* get slave's name */ return pfd; } + close (pfd); } + + return -1; } -# endif -#endif -#ifdef PTYS_ARE_PTC - if ((pfd = open ("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0) - { - *ttydev = strdup (ttyname (pfd)); - return pfd; - } -#endif +#elif defined(HAVE_OPENPTY) -#ifdef PTYS_ARE_CLONE - if ((pfd = open ("/dev/ptym/clone", O_RDWR | O_NOCTTY, 0)) >= 0) - { - *ttydev = strdup (ptsname (pfd)); + static int + get_pty (int *fd_tty, char **ttydev) + { + int pfd; + int res; + + res = openpty (&pfd, fd_tty, NULL, NULL, NULL); + + if (res != -1) + { + *ttydev = strdup (ttyname (*fd_tty)); + return pfd; + } + + return -1; + } + +#elif defined(HAVE__GETPTY) + + static int + get_pty (int *fd_tty, char **ttydev) + { + int pfd; + char *slave; + + slave = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0); + + if (slave != NULL) { + *ttydev = strdup (slave); return pfd; } -#endif -#ifdef PTYS_ARE_NUMERIC + return -1; + } + +#elif defined(HAVE_DEV_PTC) + + static int + get_pty (int *fd_tty, char **ttydev) { - int idx; - char *c1, *c2; - char pty_name[] = "/dev/ptyp???"; - char tty_name[] = "/dev/ttyp???"; - - c1 = &(pty_name[sizeof (pty_name) - 4]); - c2 = &(tty_name[sizeof (tty_name) - 4]); - for (idx = 0; idx < 256; idx++) + int pfd; + + if ((pfd = open ("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0) { - sprintf (c1, "%d", idx); - sprintf (c2, "%d", idx); - if (access (tty_name, F_OK) < 0) - { - idx = 256; - break; - } + *ttydev = strdup (ttyname (pfd)); + return pfd; + } - if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) >= 0) - { - if (access (tty_name, R_OK | W_OK) == 0) - { - *ttydev = strdup (tty_name); - return pfd; - } + return -1; + } - close (pfd); - } +#elif defined(HAVE_DEV_CLONE) + + static int + get_pty (int *fd_tty, char **ttydev) + { + int pfd; + + if ((pfd = open ("/dev/ptym/clone", O_RDWR | O_NOCTTY, 0)) >= 0) + { + *ttydev = strdup (ptsname (pfd)); + return pfd; } + + return -1; } -#endif -#ifdef PTYS_ARE_SEARCHED - { - const char *c1, *c2; - char pty_name[] = "/dev/pty??"; - char tty_name[] = "/dev/tty??"; +#else -# ifndef PTYCHAR1 -# define PTYCHAR1 "pqrstuvwxyz" -# endif -# ifndef PTYCHAR2 -# define PTYCHAR2 "0123456789abcdef" -# endif + /* Based on the code in openssh/openbsd-compat/bsd-openpty.c */ + static int + get_pty (int *fd_tty, char **ttydev) + { + int pfd; + int i; + char pty_name[32]; + char tty_name[32]; + const char *majors = "pqrstuvwxyzabcde"; + const char *minors = "0123456789abcdef"; - for (c1 = PTYCHAR1; *c1; c1++) + for (i = 0; i < 256; i++) { - pty_name[ (sizeof (pty_name) - 3)] = - tty_name[ (sizeof (pty_name) - 3)] = *c1; - for (c2 = PTYCHAR2; *c2; c2++) + snprintf(pty_name, 32, "/dev/pty%c%c", majors[i / 16], minors[i % 16]); + snprintf(tty_name, 32, "/dev/tty%c%c", majors[i / 16], minors[i % 16]); + + if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) == -1) { - pty_name[ (sizeof (pty_name) - 2)] = - tty_name[ (sizeof (pty_name) - 2)] = *c2; - if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) >= 0) - { - if (access (tty_name, R_OK | W_OK) == 0) - { - *ttydev = strdup (tty_name); - return pfd; - } + snprintf(pty_name, 32, "/dev/ptyp%d", i); + snprintf(tty_name, 32, "/dev/ttyp%d", i); + if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) == -1) + continue; + } - close (pfd); - } + if (access (tty_name, R_OK | W_OK) == 0) + { + *ttydev = strdup (tty_name); + return pfd; } + + close (pfd); } + + return -1; } -#endif - return -1; -} +#endif /*----------------------------------------------------------------------*/ /* - * Returns tty file descriptor, or -1 on failure + * Returns tty file descriptor, or -1 on failure */ static int get_tty (char *ttydev) @@ -233,38 +224,13 @@ * 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(HAVE_DEV_PTMX) && defined(I_PUSH) /* * Push STREAMS modules: * ptem: pseudo-terminal hardware emulation module. @@ -291,28 +257,67 @@ ioctl (fd_tty, I_PUSH, "ttcompat"); } #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); + +#ifdef TIOCSCTTY + ioctl (fd_tty, TIOCSCTTY, NULL); +#else + fd = open (ttyname (fd_tty), O_RDWR); if (fd >= 0) close (fd); -# endif - /* ---------------------------------------- */ +#endif + fd = open ("/dev/tty", O_WRONLY); if (fd < 0) - return -1; /* fatal */ + return -1; /* fatal */ + close (fd); - /* ---------------------------------------- */ -#endif /* ! __QNX__ */ return 0; } -#ifndef NO_SETOWNER_TTYDEV +void +ptytty::close_tty () +{ + if (tty < 0) + return; + + close (tty); + tty = -1; +} + +bool +ptytty::make_controlling_tty () +{ + return control_tty (tty) >= 0; +} + +void +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 +} + static struct ttyconf { gid_t gid; mode_t mode; @@ -323,97 +328,50 @@ struct group *gr = getgrnam ("tty"); if (gr) - { /* change group ownership of tty to "tty" */ + { + /* change group ownership of tty to "tty" */ mode = S_IRUSR | S_IWUSR | S_IWGRP; gid = gr->gr_gid; } else -#endif /* TTY_GID_SUPPORT */ +#endif /* TTY_GID_SUPPORT */ { mode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH; - gid = getgid (); + gid = 0; } } } ttyconf; -void -rxvt_ptytty::privileges (rxvt_privaction action) +ptytty_unix::ptytty_unix () { - if (!name || !*name) - return; - - rxvt_privileges (RESTORE); - - if (action == SAVE) - { -# 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 */ - ; - else -# endif - { - saved = true; - chown (name, getuid (), ttyconf.gid); /* fail silently */ - chmod (name, ttyconf.mode); -# ifdef HAVE_REVOKE - revoke (name); -# endif - } - } - else - { /* action == RESTORE */ -# ifndef RESET_TTY_TO_COMMON_DEFAULTS - 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); -# endif - - } - - rxvt_privileges (IGNORE); -} -#endif - -rxvt_ptytty::rxvt_ptytty () -{ - pty = tty = -1; name = 0; -#ifndef NO_SETOWNER_TTYDEV - saved = false; +#if UTMP_SUPPORT + cmd_pid = 0; #endif } -rxvt_ptytty::~rxvt_ptytty () +ptytty_unix::~ptytty_unix () { +#if UTMP_SUPPORT + logout (); +#endif put (); } void - -rxvt_ptytty::close_tty () +ptytty_unix::put () { - if (tty < 0) - return; + if (name) + { + chmod (name, RESTORE_TTY_MODE); + chown (name, 0, ttyconf.gid); + } - close (tty); - tty = -1; -} + close_tty (); -void -rxvt_ptytty::put () -{ -#ifndef NO_SETOWNER_TTYDEV - privileges (RESTORE); -#endif + if (pty >= 0) + close (pty); - if (pty >= 0) close (pty); - close_tty (); free (name); pty = tty = -1; @@ -421,13 +379,7 @@ } bool -rxvt_ptytty::make_controlling_tty () -{ - return control_tty (tty, name) >= 0; -} - -bool -rxvt_ptytty::get () +ptytty_unix::get () { /* get master (pty) */ if ((pty = get_pty (&tty, &name)) < 0) @@ -439,7 +391,11 @@ if (tty < 0) { #ifndef NO_SETOWNER_TTYDEV - privileges (SAVE); + chown (name, getuid (), ttyconf.gid); /* fail silently */ + chmod (name, ttyconf.mode); +# ifdef HAVE_REVOKE + revoke (name); +# endif #endif if ((tty = get_tty (name)) < 0) @@ -452,32 +408,3 @@ return true; } -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 -} - -/*----------------------- end-of-file (C source) -----------------------*/ -