--- rxvt-unicode/src/ptytty.C	2004/08/15 03:30:04	1.16
+++ rxvt-unicode/src/ptytty.C	2006/01/04 03:02:01	1.28
@@ -48,10 +48,15 @@
 #ifdef HAVE_ISASTREAM
 # include <stropts.h>
 #endif
+#ifdef HAVE_PTY_H
+# include <pty.h>
+#endif
 
-#if defined( __FreeBSD__)
 // better do this via configure, but....
+#if defined(__FreeBSD__)
 # include <libutil.h>
+#elif defined(__DARWIN__) || (defined (__MACH__) && defined (__APPLE__))
+# include <util.h>
 #endif
 
 #include <cstdio>
@@ -73,7 +78,11 @@
 #ifdef PTYS_ARE_OPENPTY
   char tty_name[sizeof "/dev/pts/????\0"];
 
-  if (openpty (&pfd, fd_tty, tty_name, NULL, NULL) != -1)
+  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;
@@ -87,7 +96,6 @@
 #endif
 
 #ifdef PTYS_ARE_GETPTY
-
   char           *ptydev;
 
   while ((ptydev = getpty ()) != NULL)
@@ -331,33 +339,36 @@
 void
 rxvt_ptytty::privileges (rxvt_privaction action)
 {
+  if (!name || !*name)
+    return;
+
   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
-
         {
+          saved = true;
           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);
+      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);
@@ -373,6 +384,9 @@
 {
   pty = tty = -1;
   name = 0;
+#ifndef NO_SETOWNER_TTYDEV
+  saved = false;
+#endif
 }
 
 rxvt_ptytty::~rxvt_ptytty ()
@@ -392,8 +406,7 @@
 rxvt_ptytty::put ()
 {
 #ifndef NO_SETOWNER_TTYDEV
-  if (tty >= 0)
-    privileges (RESTORE);
+  privileges (RESTORE);
 #endif
 
   if (pty >= 0) close (pty);
@@ -436,5 +449,32 @@
   return true;
 }
 
+void
+rxvt_ptytty::set_utf8_mode (bool on)
+{
+#ifdef IUTF8
+  if (pty != -1)
+    {
+      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) -----------------------*/