--- rxvt-unicode/src/ptytty.C 2006/01/21 18:15:26 1.53 +++ rxvt-unicode/src/ptytty.C 2008/05/05 16:51:52 1.69 @@ -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,14 +25,16 @@ * 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 #include #include @@ -38,7 +44,7 @@ #if defined(HAVE_DEV_PTMX) && defined(HAVE_SYS_STROPTS_H) # include /* for I_PUSH */ #endif -#ifdef HAVE_ISASTREAM +#if defined(HAVE_ISASTREAM) && defined(HAVE_STROPTS_H) # include #endif #if defined(HAVE_PTY_H) @@ -54,140 +60,160 @@ #include -#include "rxvtutil.h" -#include "fdpass.h" -#include "ptytty.h" - ///////////////////////////////////////////////////////////////////////////// /* ------------------------------------------------------------------------- * * 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 */ #if defined(UNIX98_PTY) -static int -get_pty (int *fd_tty, char **ttydev) -{ - int pfd; + + static int + get_pty (int *fd_tty, char **ttydev) + { + int pfd; # if defined(HAVE_GETPT) - pfd = getpt(); + pfd = getpt(); # elif defined(HAVE_POSIX_OPENPT) - pfd = posix_openpt (O_RDWR); + pfd = posix_openpt (O_RDWR); # else - pfd = open (CLONE_DEVICE, O_RDWR | O_NOCTTY, 0); + 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 */ - *ttydev = strdup (ptsname (pfd)); /* get slave's name */ - return pfd; - } - close (pfd); - } + 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); + } + + return -1; + } - return -1; -} #elif defined(HAVE_OPENPTY) -static int -get_pty (int *fd_tty, char **ttydev) -{ - int pfd; - int res; - char tty_name[32]; - - res = openpty (&pfd, fd_tty, tty_name, NULL, NULL); - if (res != -1) - { - *ttydev = strdup (tty_name); - return pfd; - } - return -1; -} + 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; - *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0); - if (*ttydev != NULL) - return pfd; + 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; + } + + return -1; + } - return -1; -} #elif defined(HAVE_DEV_PTC) -static int -get_pty (int *fd_tty, char **ttydev) -{ - int pfd; - if ((pfd = open ("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0) - { - *ttydev = strdup (ttyname (pfd)); - return pfd; - } + static int + get_pty (int *fd_tty, char **ttydev) + { + int pfd; + + if ((pfd = open ("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0) + { + *ttydev = strdup (ttyname (pfd)); + return pfd; + } + + return -1; + } - return -1; -} #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; - } + 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; + } - return -1; -} #else -/* 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 (i = 0; i < 256; i++) - { - 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) - { - 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; - } - if (access (tty_name, R_OK | W_OK) == 0) - { - *ttydev = strdup (tty_name); - return pfd; - } - close (pfd); - } -} + /* 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 (i = 0; i < 256; i++) + { + 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) + { + 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; + } + + if (access (tty_name, R_OK | W_OK) == 0) + { + *ttydev = strdup (tty_name); + return pfd; + } + + close (pfd); + } + + 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) @@ -202,6 +228,8 @@ static int control_tty (int fd_tty) { + int fd; + setsid (); #if defined(HAVE_DEV_PTMX) && defined(I_PUSH) @@ -222,7 +250,7 @@ * close () - on the master side which causes a hang up to be sent * through - Geoff Wing */ -# ifdef HAVE_ISASTREAM +#if defined(HAVE_ISASTREAM) && defined(HAVE_STROPTS_H) if (isastream (fd_tty) == 1) # endif { @@ -232,11 +260,17 @@ } #endif +#ifdef TIOCSCTTY ioctl (fd_tty, TIOCSCTTY, NULL); +#else + fd = open (ttyname (fd_tty), O_RDWR); + if (fd >= 0) + close (fd); +#endif - int fd = open ("/dev/tty", O_WRONLY); + fd = open ("/dev/tty", O_WRONLY); if (fd < 0) - return -1; /* fatal */ + return -1; /* fatal */ close (fd); @@ -244,7 +278,7 @@ } void -rxvt_ptytty::close_tty () +ptytty::close_tty () { if (tty < 0) return; @@ -254,13 +288,13 @@ } bool -rxvt_ptytty::make_controlling_tty () +ptytty::make_controlling_tty () { return control_tty (tty) >= 0; } void -rxvt_ptytty::set_utf8_mode (bool on) +ptytty::set_utf8_mode (bool on) { #ifdef IUTF8 if (pty < 0) @@ -296,12 +330,13 @@ 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 = 0; @@ -309,7 +344,7 @@ } } ttyconf; -rxvt_ptytty_unix::rxvt_ptytty_unix () +ptytty_unix::ptytty_unix () { name = 0; #if UTMP_SUPPORT @@ -317,7 +352,7 @@ #endif } -rxvt_ptytty_unix::~rxvt_ptytty_unix () +ptytty_unix::~ptytty_unix () { #if UTMP_SUPPORT logout (); @@ -326,10 +361,13 @@ } void -rxvt_ptytty_unix::put () +ptytty_unix::put () { - chmod (name, RESTORE_TTY_MODE); - chown (name, 0, ttyconf.gid); + if (name) + { + chmod (name, RESTORE_TTY_MODE); + chown (name, 0, ttyconf.gid); + } close_tty (); @@ -343,7 +381,7 @@ } bool -rxvt_ptytty_unix::get () +ptytty_unix::get () { /* get master (pty) */ if ((pty = get_pty (&tty, &name)) < 0) @@ -372,182 +410,3 @@ 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_proxy::login (int cmd_pid, bool login_shell, const char *hostname) -{ - command cmd; - - cmd.type = command::login; - cmd.id = id; - cmd.cmd_pid = cmd_pid; - cmd.login_shell = login_shell; - strncpy (cmd.hostname, hostname, sizeof (cmd.hostname)); - - write (sock_fd, &cmd, sizeof (cmd)); -} - -rxvt_ptytty_proxy::~rxvt_ptytty_proxy () -{ - command cmd; - - 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) - { - // -> 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) -----------------------*/ -