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

Comparing rxvt-unicode/src/rxvtc.C (file contents):
Revision 1.19 by root, Tue Jan 10 04:23:39 2006 UTC vs.
Revision 1.22 by root, Sun Jan 22 16:36:40 2006 UTC

  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *----------------------------------------------------------------------*/
 #include "../config.h"
-#include "rxvtdaemon.h"
-#include "fdpass.h"
-#include "rxvt.h"
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include <csignal>
 #include <unistd.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include "rxvtdaemon.h"
+#include "libptytty.h"
+#include "rxvt.h"
 struct client : rxvt_connection {
   client ();
 };
 client::client ()
 {
-  if ((fd = socket (PF_UNIX, SOCK_STREAM, 0)) < 0)
+  if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
     {
       perror ("unable to create communications socket");
       exit (EXIT_FAILURE);
     }
         fprintf (stderr, "protocol error: unexpected eof from server.\n");
         break;
       }
     else if (!strcmp (tok, "MSG") && c.recv (tok))
       fprintf (stderr, "%s", (const char *)tok);
-#if ENABLE_FRILLS && HAVE_UNIX_FDPASS
     else if (!strcmp (tok, "GETFD") && c.recv (cint))
       {
-        if (rxvt_send_fd (c.fd, cint) < 0)
+        if (!ptytty::send_fd (c.fd, cint))
           {
             fprintf (stderr, "unable to send fd %d: ", cint); perror (0);
             exit (EXIT_FAILURE);
           }
       }
-#endif
     else if (!strcmp (tok, "END"))
       {
         int success;
         if (c.recv (success))

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