--- rxvt-unicode/src/rxvtc.C 2005/11/28 19:35:04 1.16 +++ rxvt-unicode/src/rxvtc.C 2006/01/22 16:36:40 1.22 @@ -21,10 +21,6 @@ *----------------------------------------------------------------------*/ #include "../config.h" -#include "rxvtdaemon.h" - -#include "rxvt.h" - #include #include #include @@ -34,13 +30,18 @@ #include #include +#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); @@ -99,6 +100,7 @@ c.send ("END"); auto_str tok; + int cint; for (;;) if (!c.recv (tok)) @@ -108,15 +110,24 @@ } else if (!strcmp (tok, "MSG") && c.recv (tok)) fprintf (stderr, "%s", (const char *)tok); + else if (!strcmp (tok, "GETFD") && c.recv (cint)) + { + if (!ptytty::send_fd (c.fd, cint)) + { + fprintf (stderr, "unable to send fd %d: ", cint); perror (0); + exit (EXIT_FAILURE); + } + } else if (!strcmp (tok, "END")) { int success; + if (c.recv (success)) exit (success ? EXIT_SUCCESS : EXIT_FAILURE); } else { - fprintf (stderr, "protocol error: received illegal token '%s'.\n", (const char *)tok); + fprintf (stderr, "protocol error: received unsupported token '%s'.\n", (const char *)tok); break; }