From: root <root>
Date: Tue, 17 Jan 2006 16:06:48 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=6f4841babfb6eef6a993c0646b4ad97455985e88;p=dana%2Furxvt.git

*** empty log message ***
---

diff --git a/src/ptytty.C b/src/ptytty.C
index bfe3ae4c..acdac2f0 100644
--- a/src/ptytty.C
+++ b/src/ptytty.C
@@ -549,10 +549,10 @@ void serve ()
         {
           rxvt_ptytty **pty = find (ptys.begin (), ptys.end (), cmd.id);
 
-          if (*pty)
+          if (pty)
             {
-              ptys.erase (pty);
               delete *pty;
+              ptys.erase (pty);
             }
         }
       else
@@ -592,7 +592,7 @@ void rxvt_ptytty_server ()
       sock_fd = sv[1];
 
       for (int fd = 0; fd < 1023; fd++)
-        if (fd != sock_fd)
+        if (fd != sock_fd && fd != 1)
           close (fd);
 
       serve ();
diff --git a/src/rxvtutil.h b/src/rxvtutil.h
index 8b6e7dab..a16a4b28 100644
--- a/src/rxvtutil.h
+++ b/src/rxvtutil.h
@@ -258,14 +258,14 @@ public:
     void erase (iterator first, iterator last)
     {
         if (last != first) {
-            memmove (first, last, (end ()-last)*sizeof (T));
+            memmove (first, last, (end () - last) * sizeof (T));
             _last -= last - first;
         }
     }
     void erase (iterator pos)
     {
         if (pos != end ()) {
-            memmove (pos, pos+1, (end ()- (pos+1))*sizeof (T));
+            memmove (pos, pos+1, (end () - (pos+1)) * sizeof (T));
             --_last;
         }
     }