--- rxvt-unicode/src/ptytty.C 2003/12/02 21:49:46 1.4 +++ rxvt-unicode/src/ptytty.C 2004/12/12 05:54:05 1.18 @@ -1,10 +1,10 @@ /*--------------------------------*-C-*---------------------------------* - * File: ptytty.c + * File: ptytty.C *----------------------------------------------------------------------* - * $Id: ptytty.C,v 1.4 2003/12/02 21:49:46 pcg Exp $ * * All portions of code are copyright by their respective author/s. * Copyright (c) 1999-2001 Geoff Wing + * Copyright (c) 2004 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 @@ -22,14 +22,10 @@ *---------------------------------------------------------------------*/ #include "../config.h" /* NECESSARY */ +#include "rxvt.h" -/* - * Try to be self-contained except for the above autoconfig'd defines - */ - -#include #ifdef HAVE_STDLIB_H -# include +# include #endif #ifdef HAVE_SYS_TYPES_H # include @@ -38,7 +34,7 @@ # include #endif #if defined(HAVE_STRING_H) -# include +# include #endif #ifdef HAVE_FCNTL_H # include @@ -46,16 +42,23 @@ #ifdef HAVE_SYS_IOCTL_H # include #endif -#if defined(PTYS_ARE_PTMX) && !defined(__CYGWIN32__) +#if defined(PTYS_ARE_PTMX) && defined(HAVE_SYS_STROPTS_H) # include /* for I_PUSH */ #endif +#ifdef HAVE_ISASTREAM +# include +#endif -#ifdef DEBUG_TTY -# define D_TTY(x) fprintf x ; fputc('\n', stderr) ; fflush(stderr) -#else -# define D_TTY(x) +// better do this via configure, but.... +#if defined(__FreeBSD__) +# include +#elif defined(__DARWIN__) || (defined (__MACH__) && defined (__APPLE__)) +# include #endif +#include +#include + /* ------------------------------------------------------------------------- * * GET PSEUDO TELETYPE - MASTER AND SLAVE * * ------------------------------------------------------------------------- */ @@ -64,25 +67,23 @@ * 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 */ -/* EXTPROTO */ -int -rxvt_get_pty(int *fd_tty, const char **ttydev) +static int +get_pty (int *fd_tty, char **ttydev) { int pfd; #ifdef PTYS_ARE_OPENPTY - char tty_name[sizeof "/dev/pts/????\0"]; - if (openpty(&pfd, fd_tty, tty_name, NULL, NULL) != -1) + if (openpty (&pfd, fd_tty, tty_name, NULL, NULL) != -1) { - *ttydev = strdup(tty_name); + *ttydev = strdup (tty_name); return pfd; } #endif #ifdef PTYS_ARE__GETPTY - *ttydev = _getpty(&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0); + *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0); if (*ttydev != NULL) return pfd; #endif @@ -91,8 +92,8 @@ char *ptydev; - while ((ptydev = getpty()) != NULL) - if ((pfd = open(ptydev, O_RDWR | O_NOCTTY, 0)) >= 0) + while ((ptydev = getpty ()) != NULL) + if ((pfd = open (ptydev, O_RDWR | O_NOCTTY, 0)) >= 0) { *ttydev = ptydev; return pfd; @@ -104,77 +105,79 @@ { # ifdef PTYS_ARE_GETPT - pfd = getpt(); + pfd = getpt (); # else - - pfd = open("/dev/ptmx", O_RDWR | O_NOCTTY, 0); + pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0); # endif if (pfd >= 0) { - if (grantpt(pfd) == 0 /* change slave permissions */ - && unlockpt(pfd) == 0) + if (grantpt (pfd) == 0 /* change slave permissions */ + && unlockpt (pfd) == 0) { /* slave now unlocked */ - *ttydev = ptsname(pfd); /* get slave's name */ + *ttydev = strdup (ptsname (pfd)); /* get slave's name */ return pfd; } - close(pfd); + close (pfd); } } # endif #endif #ifdef PTYS_ARE_PTC - if ((pfd = open("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0) + if ((pfd = open ("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0) { - *ttydev = ttyname(pfd); + *ttydev = strdup (ttyname (pfd)); return pfd; } #endif #ifdef PTYS_ARE_CLONE - if ((pfd = open("/dev/ptym/clone", O_RDWR | O_NOCTTY, 0)) >= 0) + if ((pfd = open ("/dev/ptym/clone", O_RDWR | O_NOCTTY, 0)) >= 0) { - *ttydev = ptsname(pfd); + *ttydev = strdup (ptsname (pfd)); return pfd; } #endif #ifdef PTYS_ARE_NUMERIC { - int idx; - char *c1, *c2; - char pty_name[] = "/dev/ptyp???"; - char tty_name[] = "/dev/ttyp???"; + 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]); + 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) + 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 ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) >= 0) { - if (access(tty_name, R_OK | W_OK) == 0) + if (access (tty_name, R_OK | W_OK) == 0) { - *ttydev = strdup(tty_name); + *ttydev = strdup (tty_name); return pfd; } - close(pfd); + + close (pfd); } } } #endif + #ifdef PTYS_ARE_SEARCHED { - const char *c1, *c2; - char pty_name[] = "/dev/pty??"; - char tty_name[] = "/dev/tty??"; + const char *c1, *c2; + char pty_name[] = "/dev/pty??"; + char tty_name[] = "/dev/tty??"; # ifndef PTYCHAR1 # define PTYCHAR1 "pqrstuvwxyz" @@ -185,25 +188,27 @@ for (c1 = PTYCHAR1; *c1; c1++) { - pty_name[(sizeof(pty_name) - 3)] = - tty_name[(sizeof(pty_name) - 3)] = *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) + 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) + if (access (tty_name, R_OK | W_OK) == 0) { - *ttydev = strdup(tty_name); + *ttydev = strdup (tty_name); return pfd; } - close(pfd); + + close (pfd); } } } } #endif + return -1; } @@ -211,9 +216,8 @@ /* * Returns tty file descriptor, or -1 on failure */ -/* EXTPROTO */ -int -rxvt_get_tty (const char *ttydev) +static int +get_tty (char *ttydev) { return open (ttydev, O_RDWR | O_NOCTTY, 0); } @@ -222,14 +226,12 @@ /* * Make our tty a controlling tty so that /dev/tty points to us */ -/* EXTPROTO */ -int -rxvt_control_tty (int fd_tty, const char *ttydev) +static int +control_tty (int fd_tty, const char *ttydev) { #ifndef __QNX__ int fd; - D_TTY ((stderr, "rxvt_control_tty(): pid: %d, tty fd: %d, dev: %s", getpid(), fd_tty, ttydev)); /* ---------------------------------------- */ # ifdef HAVE_SETSID setsid (); @@ -239,22 +241,22 @@ # elif defined(HAVE_SETPGRP) setpgrp (0, 0); # endif + /* ---------------------------------------- */ # ifdef TIOCNOTTY - fd = open ("/dev/tty", O_RDWR | O_NOCTTY); - D_TTY ((stderr, "rxvt_control_tty(): Voiding tty associations: previous=%s", fd < 0 ? "no" : "yes")); if (fd >= 0) { ioctl (fd, TIOCNOTTY, NULL); /* void tty associations */ close (fd); } # endif + /* ---------------------------------------- */ fd = open ("/dev/tty", O_RDWR | O_NOCTTY); - D_TTY ((stderr, "rxvt_control_tty(): /dev/tty has controlling tty? %s", fd < 0 ? "no (good)" : "yes (bad)")); if (fd >= 0) close (fd); /* ouch: still have controlling tty */ + /* ---------------------------------------- */ #if defined(PTYS_ARE_PTMX) && defined(I_PUSH) /* @@ -263,22 +265,21 @@ * ldterm: standard terminal line discipline. * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module. * - * After we push the STREAMS modules, the first open() on the slave side + * After we push the STREAMS modules, the first open () on the slave side * (i.e. the next section between the dashes giving us "tty opened OK") * should make the "ptem" (or "ldterm" depending upon either which OS * version or which set of manual pages you have) module give us a - * controlling terminal. We must already have close()d the master side + * controlling terminal. We must already have close ()d the master side * fd in this child process before we push STREAMS modules on because the - * documentation is really unclear about whether it is any close() on - * the master side or the last close() - i.e. a proper STREAMS dismantling - * close() - on the master side which causes a hang up to be sent + * documentation is really unclear about whether it is any close () on + * the master side or the last close () - i.e. a proper STREAMS dismantling + * close () - on the master side which causes a hang up to be sent * through - Geoff Wing */ # ifdef HAVE_ISASTREAM if (isastream (fd_tty) == 1) # endif { - D_TTY ((stderr, "rxvt_control_tty(): Pushing STREAMS modules")); ioctl (fd_tty, I_PUSH, "ptem"); ioctl (fd_tty, I_PUSH, "ldterm"); ioctl (fd_tty, I_PUSH, "ttcompat"); @@ -287,27 +288,155 @@ /* ---------------------------------------- */ # if defined(TIOCSCTTY) fd = ioctl (fd_tty, TIOCSCTTY, NULL); - D_TTY ((stderr, "rxvt_control_tty(): ioctl(..,TIOCSCTTY): %d", fd)); # elif defined(TIOCSETCTTY) fd = ioctl (fd_tty, TIOCSETCTTY, NULL); - D_TTY ((stderr, "rxvt_control_tty(): ioctl(..,TIOCSETCTTY): %d", fd)); # else fd = open (ttydev, O_RDWR); - D_TTY ((stderr, "rxvt_control_tty(): tty open%s", fd < 0 ? " failure" : "ed OK")); if (fd >= 0) - close(fd); + close (fd); # endif /* ---------------------------------------- */ fd = open ("/dev/tty", O_WRONLY); - D_TTY ((stderr, "rxvt_control_tty(): do we have controlling tty now: %s", fd < 0 ? "no (fatal)" : "yes (good)")); if (fd < 0) return -1; /* fatal */ close (fd); /* ---------------------------------------- */ - D_TTY ((stderr, "rxvt_control_tty(): tcgetpgrp(): %d getpgrp(): %d", tcgetpgrp(fd_tty), getpgrp())); - /* ---------------------------------------- */ #endif /* ! __QNX__ */ return 0; } + +#ifndef NO_SETOWNER_TTYDEV +static struct ttyconf { + gid_t gid; + mode_t mode; + + ttyconf () + { +#ifdef TTY_GID_SUPPORT + struct group *gr = getgrnam ("tty"); + + if (gr) + { /* change group ownership of tty to "tty" */ + mode = S_IRUSR | S_IWUSR | S_IWGRP; + gid = gr->gr_gid; + } + else +#endif /* TTY_GID_SUPPORT */ + { + mode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH; + gid = getgid (); + } + } +} ttyconf; + +void +rxvt_ptytty::privileges (rxvt_privaction action) +{ + 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 + + { + 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); +# 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; +} + +rxvt_ptytty::~rxvt_ptytty () +{ + put (); +} + +void + +rxvt_ptytty::close_tty () +{ + if (tty >= 0) close (tty); + tty = -1; +} + +void +rxvt_ptytty::put () +{ +#ifndef NO_SETOWNER_TTYDEV + if (tty >= 0) + privileges (RESTORE); +#endif + + if (pty >= 0) close (pty); + close_tty (); + free (name); + + pty = tty = -1; + name = 0; +} + +bool +rxvt_ptytty::make_controlling_tty () +{ + return control_tty (tty, name) >= 0; +} + +bool +rxvt_ptytty::get () +{ + /* get master (pty) */ + if ((pty = get_pty (&tty, &name)) < 0) + return false; + + fcntl (pty, F_SETFL, O_NONBLOCK); + + /* get slave (tty) */ + if (tty < 0) + { +#ifndef NO_SETOWNER_TTYDEV + privileges (SAVE); +#endif + + if ((tty = get_tty (name)) < 0) + { + put (); + return false; + } + } + + return true; +} + /*----------------------- end-of-file (C source) -----------------------*/ +