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

Comparing rxvt-unicode/src/proxy.C (file contents):
Revision 1.4 by root, Tue Feb 7 05:32:47 2006 UTC vs.
Revision 1.10 by sf-exg, Wed Jul 21 08:46:13 2010 UTC

  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *---------------------------------------------------------------------*/
-#include "../config.h"
+#include "config.h"
 #include "ptytty.h"
+#include <cstdio>
+#include <cstring>
 #include <csignal>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <errno.h>
 // helper/proxy support
 #if PTYTTY_HELPER
 ptytty_proxy::~ptytty_proxy ()
 {
   if (id)
     {
+      close_tty ();
+      if (pty >= 0)
+        close (pty);
       NEED_TOKEN;
       command cmd;
       cmd.type = command::destroy;
 #endif
     return new ptytty_unix;
 }
 void
+ptytty::sanitise_stdfd ()
+{
+  // sanitise stdin/stdout/stderr to point to *something*.
+  for (int fd = 0; fd <= 2; ++fd)
+    if (fcntl (fd, F_GETFL) < 0 && errno == EBADF)
+      {
+        int fd2 = open ("/dev/tty", fd ? O_WRONLY : O_RDONLY);
+        if (fd2 < 0)
+          fd2 = open ("/dev/null", fd ? O_WRONLY : O_RDONLY);
+        if (fd2 != fd)
+          abort ();
+      }
+}
+void
 ptytty::init ()
 {
+  sanitise_stdfd ();
   uid_t uid = getuid ();
   gid_t gid = getgid ();
   // before doing anything else, check for setuid/setgid operation,
   // start the helper process and drop privileges
   if (uid != geteuid ()
       || gid != getegid ())
     {

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