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

Comparing rxvt-unicode/src/ptytty.C (file contents):
Revision 1.22 by root, Tue Jan 11 04:44:57 2005 UTC vs.
Revision 1.26 by root, Mon Jan 2 15:10:18 2006 UTC

   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)
       {
 } ttyconf;
 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
+      if (saved)
+        {
-      chmod (name, savestat.st_mode);
+          chmod (name, savestat.st_mode);
-      chown (name, savestat.st_uid, savestat.st_gid);
+          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_ptytty::rxvt_ptytty ()
 {
   pty = tty = -1;
   name = 0;
+#ifndef NO_SETOWNER_TTYDEV
+  saved = false;
+#endif
 }
 rxvt_ptytty::~rxvt_ptytty ()
 {
   put ();

Diff Legend

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

Comparing rxvt-unicode/src/ptytty.C (file contents): Revision 1.22 by root, Tue Jan 11 04:44:57 2005 UTC vs. Revision 1.26 by root, Mon Jan 2 15:10:18 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/ptytty.C (file contents):
Revision 1.22 by root, Tue Jan 11 04:44:57 2005 UTC vs.
Revision 1.26 by root, Mon Jan 2 15:10:18 2006 UTC