[ViewVC] Diff of: cvs/rxvt-unicode/src/ptytty.C

Comparing rxvt-unicode/src/ptytty.C (file contents):
Revision 1.31 by root, Tue Jan 10 18:09:22 2006 UTC vs.
Revision 1.35 by root, Tue Jan 17 10:19:13 2006 UTC

   *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)
+# 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)
       {
         if (grantpt (pfd) == 0	/* change slave permissions */
   pty = tty = -1;
   name = 0;
 #ifndef NO_SETOWNER_TTYDEV
   saved = false;
 #endif
+#if UTMP_SUPPORT
+  cmd_pid = 0;
+#endif
 }
 rxvt_ptytty::~rxvt_ptytty ()
 {
+  logout ();
   put ();
 }
 void

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines