--- rxvt-unicode/src/ptytty.C	2006/01/17 10:59:32	1.36
+++ rxvt-unicode/src/ptytty.C	2007/06/26 21:30:10	1.65
@@ -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 <gcw@pobox.com>
  * Copyright (c) 2004-2006 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2006      Emanuele Giaquinta <e.giaquinta@glauco.it>
  *
  * 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,25 +25,22 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *---------------------------------------------------------------------*/
 
-#include "../config.h"		/* NECESSARY */
-#include "rxvt.h"
+#include "../config.h"
 
-# include <cstdlib>
-# include <cstring>
+#include "ptytty.h"
+
+#include <cstdlib>
+#include <cstring>
+#include <csignal>
+
+#include <sys/types.h>
+#include <unistd.h>
+#include <fcntl.h>
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
 #ifdef HAVE_SYS_IOCTL_H
 # include <sys/ioctl.h>
 #endif
-#if defined(PTYS_ARE_PTMX) && defined(HAVE_SYS_STROPTS_H)
+#if defined(HAVE_DEV_PTMX) && defined(HAVE_SYS_STROPTS_H)
 # include <sys/stropts.h>      /* for I_PUSH */
 #endif
 #ifdef HAVE_ISASTREAM
@@ -52,9 +53,11 @@
 #elif defined(HAVE_UTIL_H)
 # include <util.h>
 #endif
+#ifdef TTY_GID_SUPPORT
+#include <grp.h>
+#endif
 
 #include <cstdio>
-#include <grp.h>
 
 /////////////////////////////////////////////////////////////////////////////
 
@@ -62,48 +65,24 @@
  *                  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
-
-#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
-# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_POSIX) || defined(PTYS_ARE_PTMX)
+#if defined(UNIX98_PTY)
 
+  static int
+  get_pty (int *fd_tty, char **ttydev)
   {
-#  ifdef PTYS_ARE_GETPT
+    int pfd;
+
+# if defined(HAVE_GETPT)
     pfd = getpt();
-#  else
-#  ifdef PTYS_ARE_POSIX
+# elif defined(HAVE_POSIX_OPENPT)
     pfd = posix_openpt (O_RDWR);
-#  else
-    pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0);
-#  endif
-#  endif
+# else
+    pfd = open (CLONE_DEVICE, O_RDWR | O_NOCTTY, 0);
+# endif
 
     if (pfd >= 0)
       {
@@ -113,103 +92,123 @@
             *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;
+    char tty_name[32];
+
+    res = openpty (&pfd, fd_tty, tty_name, NULL, NULL);
+
+    if (res != -1)
+      {
+        *ttydev = strdup (tty_name);
+        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;
-    }
-#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)
@@ -224,36 +223,11 @@
 static int
 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.
@@ -271,30 +245,35 @@
    * 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
-  /* ---------------------------------------- */
-  fd = ioctl (fd_tty, TIOCSCTTY, NULL);
-  /* ---------------------------------------- */
+#endif
+
+#ifdef TIOCSCTTY
+  ioctl (fd_tty, TIOCSCTTY, NULL);
+#else
+  fd = open (ttyname (fd_tty), O_RDWR);
+  if (fd >= 0)
+    close (fd);
+#endif
+
   fd = open ("/dev/tty", O_WRONLY);
   if (fd < 0)
-    return -1;		/* fatal */
+    return -1; /* fatal */
+
   close (fd);
-  /* ---------------------------------------- */
-#endif				/* ! __QNX__ */
 
   return 0;
 }
 
 void
-rxvt_ptytty::close_tty ()
+ptytty::close_tty ()
 {
   if (tty < 0)
     return;
@@ -304,13 +283,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)
@@ -336,9 +315,6 @@
 #endif
 }
 
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef NO_SETOWNER_TTYDEV
 static struct ttyconf {
   gid_t gid;
   mode_t mode;
@@ -357,84 +333,41 @@
 #endif                          /* TTY_GID_SUPPORT */
         {
           mode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH;
-          gid = getgid ();
+          gid = 0;
         }
     }
 } ttyconf;
 
-/////////////////////////////////////////////////////////////////////////////
-
-void
-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);
-# 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_unix::rxvt_ptytty_unix ()
+ptytty_unix::ptytty_unix ()
 {
-  pty = tty = -1;
   name = 0;
-#ifndef NO_SETOWNER_TTYDEV
-  saved = false;
-#endif
 #if UTMP_SUPPORT
   cmd_pid = 0;
 #endif
 }
 
-rxvt_ptytty_unix::~rxvt_ptytty_unix ()
+ptytty_unix::~ptytty_unix ()
 {
+#if UTMP_SUPPORT
   logout ();
+#endif
   put ();
 }
 
 void
-rxvt_ptytty_unix::put ()
+ptytty_unix::put ()
 {
-#ifndef NO_SETOWNER_TTYDEV
-  privileges (RESTORE);
-#endif
+  if (name)
+    {
+      chmod (name, RESTORE_TTY_MODE);
+      chown (name, 0, ttyconf.gid);
+    }
 
-  if (pty >= 0) close (pty);
   close_tty ();
+
+  if (pty >= 0)
+    close (pty);
+
   free (name);
 
   pty = tty = -1;
@@ -442,7 +375,7 @@
 }
 
 bool
-rxvt_ptytty_unix::get ()
+ptytty_unix::get ()
 {
   /* get master (pty) */
   if ((pty = get_pty (&tty, &name)) < 0)
@@ -454,7 +387,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)
@@ -467,5 +404,3 @@
   return true;
 }
 
-/*----------------------- end-of-file (C source) -----------------------*/
-