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

Comparing rxvt-unicode/src/rxvtd.C (file contents):
Revision 1.21 by root, Thu Jul 7 19:37:47 2005 UTC vs.
Revision 1.22 by root, Fri Dec 23 14:46:35 2005 UTC

  *----------------------------------------------------------------------*/
 #include "../config.h"
 #include "rxvt.h"
 #include "rxvtdaemon.h"
+#include "fdpass.h"
 #include "iom.h"
 #include <cstdio>
 #include <cstdlib>
 #include <cstdarg>
 extern char **environ;
 struct server : rxvt_connection {
   log_callback log_cb;
+  getfd_callback getfd_cb;
   void read_cb (io_watcher &w, short revents); io_watcher read_ev;
   void log_msg (const char *msg);
+  int getfd (int remote_fd);
   server (int fd)
   : read_ev (this, &server::read_cb),
-    log_cb (this, &server::log_msg)
+    log_cb (this, &server::log_msg),
+    getfd_cb (this, &server::getfd)
   {
     this->fd = fd;
     read_ev.start (fd, EVENT_READ);
   }
   if (fd2 >= 0)
     {
       fcntl (fd2, F_SETFD, FD_CLOEXEC);
       new server (fd2);
     }
+}
+int server::getfd (int remote_fd)
+{
+#if ENABLE_FRILLS && HAVE_UNIX_FDPASS
+  send ("GETFD");
+  send (remote_fd);
+  return rxvt_recv_fd (fd);
+#else
+  return -1;
+#endif
 }
 void server::log_msg (const char *msg)
 {
   send ("MSG"), send (msg);
             environ = envv->begin ();
             rxvt_term *term = new rxvt_term;
             term->log_hook = &log_cb;
+            term->getfd_hook = &getfd_cb;
             term->argv = argv;
             term->envv = envv;
             bool success;

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