--- rxvt-unicode/src/ptytty.C	2006/01/06 05:37:59	1.30
+++ rxvt-unicode/src/ptytty.C	2006/01/17 11:53:07	1.38
@@ -24,18 +24,15 @@
 #include "../config.h"		/* NECESSARY */
 #include "rxvt.h"
 
-#ifdef HAVE_STDLIB_H
 # include <cstdlib>
-#endif
+# include <cstring>
+
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
-#if defined(HAVE_STRING_H)
-# include <cstring>
-#endif
 #ifdef HAVE_FCNTL_H
 # include <fcntl.h>
 #endif
@@ -48,20 +45,19 @@
 #ifdef HAVE_ISASTREAM
 # include <stropts.h>
 #endif
-#ifdef HAVE_PTY_H
+#if defined(HAVE_PTY_H)
 # include <pty.h>
-#endif
-
-// better do this via configure, but....
-#if defined(__FreeBSD__)
+#elif defined(HAVE_LIBUTIL_H)
 # include <libutil.h>
-#elif defined(__DARWIN__) || (defined (__MACH__) && defined (__APPLE__))
+#elif defined(HAVE_UTIL_H)
 # include <util.h>
 #endif
 
 #include <cstdio>
 #include <grp.h>
 
+/////////////////////////////////////////////////////////////////////////////
+
 /* ------------------------------------------------------------------------- *
  *                  GET PSEUDO TELETYPE - MASTER AND SLAVE                   *
  * ------------------------------------------------------------------------- */
@@ -95,26 +91,19 @@
     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(PTYS_ARE_GETPT) || defined(PTYS_ARE_POSIX) || defined(PTYS_ARE_PTMX)
 
   {
 #  ifdef PTYS_ARE_GETPT
-    pfd = getpt ();
+    pfd = getpt();
+#  else
+#  ifdef PTYS_ARE_POSIX
+    pfd = posix_openpt (O_RDWR);
 #  else
     pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0);
 #  endif
+#  endif
 
     if (pfd >= 0)
       {
@@ -233,38 +222,15 @@
  * 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(PTYS_ARE_PTMX) && defined(I_PUSH)
   /*
    * Push STREAMS modules:
    *    ptem: pseudo-terminal hardware emulation module.
@@ -282,36 +248,72 @@
    * 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
+# 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);
   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;
@@ -336,8 +338,10 @@
     }
 } ttyconf;
 
+/////////////////////////////////////////////////////////////////////////////
+
 void
-rxvt_ptytty::privileges (rxvt_privaction action)
+rxvt_ptytty_unix::privileges (rxvt_privaction action)
 {
   if (!name || !*name)
     return;
@@ -380,33 +384,26 @@
 }
 #endif
 
-rxvt_ptytty::rxvt_ptytty ()
+rxvt_ptytty_unix::rxvt_ptytty_unix ()
 {
   pty = tty = -1;
   name = 0;
 #ifndef NO_SETOWNER_TTYDEV
   saved = false;
 #endif
+#if UTMP_SUPPORT
+  cmd_pid = 0;
+#endif
 }
 
-rxvt_ptytty::~rxvt_ptytty ()
+rxvt_ptytty_unix::~rxvt_ptytty_unix ()
 {
+  logout ();
   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 +418,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,32 +443,5 @@
   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) -----------------------*/