--- rxvt-unicode/src/ptytty.C 2006/01/06 05:37:59 1.30 +++ rxvt-unicode/src/ptytty.C 2006/01/19 10:44:44 1.48 @@ -24,21 +24,14 @@ #include "../config.h" /* NECESSARY */ #include "rxvt.h" -#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 +#include +#include + +#include +#include +#include +#include + #ifdef HAVE_SYS_IOCTL_H # include #endif @@ -48,20 +41,23 @@ #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 #include #include +#include "rxvtutil.h" +#include "fdpass.h" +#include "ptytty.h" + +///////////////////////////////////////////////////////////////////////////// + /* ------------------------------------------------------------------------- * * GET PSEUDO TELETYPE - MASTER AND SLAVE * * ------------------------------------------------------------------------- */ @@ -70,18 +66,44 @@ * 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) +static inline int +get_pty_streams (int *fd_tty, char **ttydev) { +#ifdef NO_SETOWNER_TTYDEV int pfd; -#ifdef PTYS_ARE_OPENPTY - char tty_name[sizeof "/dev/pts/????\0"]; +# if defined(PTYS_ARE_GETPT) + pfd = getpt(); +# elif defined(PTYS_ARE_POSIX) + pfd = posix_openpt (O_RDWR); +# else + pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0); +# endif + if (pfd >= 0) + { + if (grantpt (pfd) == 0 /* change slave permissions */ + && unlockpt (pfd) == 0) + { /* slave now unlocked */ + *ttydev = strdup (ptsname (pfd)); /* get slave's name */ + return pfd; + } + + close (pfd); + } +#endif - rxvt_privileges(RESTORE); - int res = openpty (&pfd, fd_tty, tty_name, NULL, NULL); - rxvt_privileges(IGNORE); + return -1; +} +static inline int +get_pty_openpty (int *fd_tty, char **ttydev) +{ +#ifdef PTYS_ARE_OPENPTY + int pfd; + int res; + char tty_name[sizeof "/dev/pts/????\0"]; + + res = openpty (&pfd, fd_tty, tty_name, NULL, NULL); if (res != -1) { *ttydev = strdup (tty_name); @@ -89,48 +111,29 @@ } #endif + return -1; +} + +static inline int +get_pty__getpty (int *fd_tty, char **ttydev) +{ #ifdef PTYS_ARE__GETPTY + int pfd; + *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) - - { -# ifdef PTYS_ARE_GETPT - pfd = getpt (); -# else - pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0); -# endif - - if (pfd >= 0) - { - if (grantpt (pfd) == 0 /* change slave permissions */ - && unlockpt (pfd) == 0) - { /* slave now unlocked */ - *ttydev = strdup (ptsname (pfd)); /* get slave's name */ - return pfd; - } - close (pfd); - } - } -# endif -#endif + return -1; +} +static inline int +get_pty_ptc (int *fd_tty, char **ttydev) +{ #ifdef PTYS_ARE_PTC + int pfd; + if ((pfd = open ("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0) { *ttydev = strdup (ttyname (pfd)); @@ -138,7 +141,15 @@ } #endif + return -1; +} + +static inline int +get_pty_clone (int *fd_tty, char **ttydev) +{ #ifdef PTYS_ARE_CLONE + int pfd; + if ((pfd = open ("/dev/ptym/clone", O_RDWR | O_NOCTTY, 0)) >= 0) { *ttydev = strdup (ptsname (pfd)); @@ -146,78 +157,108 @@ } #endif + return -1; +} + +static inline int +get_pty_numeric (int *fd_tty, char **ttydev) +{ #ifdef PTYS_ARE_NUMERIC - { - 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++) - { - sprintf (c1, "%d", idx); - sprintf (c2, "%d", idx); - if (access (tty_name, F_OK) < 0) - { - idx = 256; - break; - } - - 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; - } - - close (pfd); - } - } - } + int pfd; + 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++) + { + sprintf (c1, "%d", idx); + sprintf (c2, "%d", idx); + + if (access (tty_name, F_OK) < 0) + { + idx = 256; + break; + } + + 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; + } + + close (pfd); + } + } #endif -#ifdef PTYS_ARE_SEARCHED - { - const char *c1, *c2; - char pty_name[] = "/dev/pty??"; - char tty_name[] = "/dev/tty??"; + return -1; +} +static inline int +get_pty_searched (int *fd_tty, char **ttydev) +{ +#ifdef PTYS_ARE_SEARCHED # ifndef PTYCHAR1 # define PTYCHAR1 "pqrstuvwxyz" # endif # ifndef PTYCHAR2 # define PTYCHAR2 "0123456789abcdef" # endif + int pfd; + const char *c1, *c2; + char pty_name[] = "/dev/pty??"; + char tty_name[] = "/dev/tty??"; - for (c1 = PTYCHAR1; *c1; c1++) - { - pty_name[ (sizeof (pty_name) - 3)] = - tty_name[ (sizeof (pty_name) - 3)] = *c1; - for (c2 = PTYCHAR2; *c2; c2++) - { - 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; - } - - close (pfd); - } - } - } - } + for (c1 = PTYCHAR1; *c1; c1++) + { + pty_name[ (sizeof (pty_name) - 3)] = + tty_name[ (sizeof (pty_name) - 3)] = *c1; + + for (c2 = PTYCHAR2; *c2; c2++) + { + 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; + } + + close (pfd); + } + } + } #endif return -1; } +static int +get_pty (int *fd_tty, char **ttydev) +{ + int pfd; + + if ((pfd = get_pty_streams (fd_tty, ttydev)) != -1 + || (pfd = get_pty_openpty (fd_tty, ttydev)) != -1 + || (pfd = get_pty__getpty (fd_tty, ttydev)) != -1 + || (pfd = get_pty_ptc (fd_tty, ttydev)) != -1 + || (pfd = get_pty_clone (fd_tty, ttydev)) != -1 + || (pfd = get_pty_numeric (fd_tty, ttydev)) != -1 + || (pfd = get_pty_searched (fd_tty, ttydev)) != -1) + return pfd; + + return -1; +} + /*----------------------------------------------------------------------*/ /* * Returns tty file descriptor, or -1 on failure @@ -233,37 +274,10 @@ * 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) /* * Push STREAMS modules: @@ -291,27 +305,63 @@ 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); - if (fd >= 0) - close (fd); -# endif - /* ---------------------------------------- */ - fd = open ("/dev/tty", O_WRONLY); + + ioctl (fd_tty, TIOCSCTTY, NULL); + + int 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; @@ -331,82 +381,54 @@ #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) +rxvt_ptytty_unix::privileges (rxvt_privaction action) { 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); + chown (name, getuid (), ttyconf.gid); /* fail silently */ + chmod (name, ttyconf.mode); # ifdef HAVE_REVOKE - revoke (name); + 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 - + chmod (name, RESTORE_TTY_MODE); + chown (name, 0, ttyconf.gid); } - - rxvt_privileges (IGNORE); } #endif -rxvt_ptytty::rxvt_ptytty () +rxvt_ptytty_unix::rxvt_ptytty_unix () { pty = tty = -1; name = 0; -#ifndef NO_SETOWNER_TTYDEV - saved = false; +#if UTMP_SUPPORT + cmd_pid = 0; #endif } -rxvt_ptytty::~rxvt_ptytty () +rxvt_ptytty_unix::~rxvt_ptytty_unix () { +#if UTMP_SUPPORT + logout (); +#endif put (); } void - -rxvt_ptytty::close_tty () -{ - if (tty < 0) - return; - - close (tty); - tty = -1; -} - -void -rxvt_ptytty::put () +rxvt_ptytty_unix::put () { #ifndef NO_SETOWNER_TTYDEV privileges (RESTORE); @@ -421,13 +443,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) @@ -452,31 +468,180 @@ return true; } +#if PTYTTY_HELPER + +static int sock_fd; +static int pid; + +struct command +{ + enum { get, login, destroy } type; + + rxvt_ptytty *id; + + bool login_shell; + int cmd_pid; + char hostname[512]; // arbitrary, but should be plenty +}; + +struct rxvt_ptytty_proxy : zero_initialized, rxvt_ptytty +{ + rxvt_ptytty *id; + + ~rxvt_ptytty_proxy (); + + bool get (); + void login (int cmd_pid, bool login_shell, const char *hostname); +}; + +bool +rxvt_ptytty_proxy::get () +{ + command cmd; + + cmd.type = command::get; + + write (sock_fd, &cmd, sizeof (cmd)); + + if (read (sock_fd, &id, sizeof (id)) != sizeof (id)) + rxvt_fatal ("protocol error while creating pty using helper process, aborting.\n"); + + if (!id) + return false; + + if ((pty = rxvt_recv_fd (sock_fd)) < 0 + || (tty = rxvt_recv_fd (sock_fd)) < 0) + rxvt_fatal ("protocol error while reading pty/tty fds from helper process, aborting.\n"); + + return true; +} + void -rxvt_ptytty::set_utf8_mode (bool on) +rxvt_ptytty_proxy::login (int cmd_pid, bool login_shell, const char *hostname) { -#ifdef IUTF8 - if (pty < 0) - return; + command cmd; - struct termios tio; + cmd.type = command::login; + cmd.id = id; + cmd.cmd_pid = cmd_pid; + cmd.login_shell = login_shell; + strncpy (cmd.hostname, hostname, sizeof (cmd.hostname)); - if (tcgetattr (pty, &tio) != -1) - { - tcflag_t new_cflag = tio.c_iflag; + write (sock_fd, &cmd, sizeof (cmd)); +} - if (on) - new_cflag |= IUTF8; - else - new_cflag &= ~IUTF8; +rxvt_ptytty_proxy::~rxvt_ptytty_proxy () +{ + command cmd; - if (new_cflag != tio.c_iflag) + cmd.type = command::destroy; + cmd.id = id; + + write (sock_fd, &cmd, sizeof (cmd)); +} + +static +void serve () +{ + command cmd; + vector ptys; + + while (read (sock_fd, &cmd, sizeof (command)) == sizeof (command)) + { + if (cmd.type == command::get) { - tio.c_iflag = new_cflag; - tcsetattr (pty, TCSANOW, &tio); + // -> id ptyfd ttyfd + cmd.id = new rxvt_ptytty_unix; + + if (cmd.id->get ()) + { + write (sock_fd, &cmd.id, sizeof (cmd.id)); + ptys.push_back (cmd.id); + + rxvt_send_fd (sock_fd, cmd.id->pty); + rxvt_send_fd (sock_fd, cmd.id->tty); + } + else + { + delete cmd.id; + cmd.id = 0; + write (sock_fd, &cmd.id, sizeof (cmd.id)); + } } + else if (cmd.type == command::login) + { +#if UTMP_SUPPORT + if (find (ptys.begin (), ptys.end (), cmd.id)) + { + cmd.hostname[sizeof (cmd.hostname) - 1] = 0; + cmd.id->login (cmd.cmd_pid, cmd.login_shell, cmd.hostname); + } +#endif + } + else if (cmd.type == command::destroy) + { + rxvt_ptytty **pty = find (ptys.begin (), ptys.end (), cmd.id); + + if (pty) + { + delete *pty; + ptys.erase (pty); + } + } + else + break; + } + + // destroy all ptys + for (rxvt_ptytty **i = ptys.end (); i-- > ptys.begin (); ) + delete *i; +} + +void rxvt_ptytty_server () +{ + int sv[2]; + + if (socketpair (AF_UNIX, SOCK_STREAM, 0, sv)) + rxvt_fatal ("could not create socket to communicate with pty/sessiondb helper, aborting.\n"); + + pid = fork (); + + if (pid < 0) + rxvt_fatal ("could not create pty/sessiondb helper process, aborting.\n"); + + if (pid) + { + // client, urxvt + sock_fd = sv[0]; + close (sv[1]); + fcntl (sock_fd, F_SETFD, FD_CLOEXEC); } + else + { + // server, pty-helper + sock_fd = sv[1]; + + for (int fd = 0; fd < 1023; fd++) + if (fd != sock_fd) + close (fd); + + serve (); + _exit (EXIT_SUCCESS); + } +} +#endif + +// a "factory" *g* +rxvt_ptytty * +rxvt_new_ptytty () +{ +#if PTYTTY_HELPER + if (pid > 0) + // use helper process + return new rxvt_ptytty_proxy; + else #endif + return new rxvt_ptytty_unix; } /*----------------------- end-of-file (C source) -----------------------*/