--- rxvt-unicode/src/rxvtc.C 2004/02/13 12:16:21 1.7 +++ rxvt-unicode/src/rxvtc.C 2004/04/08 20:31:45 1.11 @@ -1,5 +1,30 @@ +/*--------------------------------*-C-*---------------------------------* + * File: rxvtc.C + *----------------------------------------------------------------------* + * + * All portions of code are copyright by their respective author/s. + * Copyright (c) 2003-2004 Marc Lehmann + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * 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 "rxvtdaemon.h" +#include "rxvt.h" + #include #include @@ -14,7 +39,7 @@ client::client () { - if ((fd = socket (PF_LOCAL, SOCK_STREAM, 0)) < 0) + if ((fd = socket (PF_UNIX, SOCK_STREAM, 0)) < 0) { perror ("unable to create communications socket"); exit (EXIT_FAILURE); @@ -60,5 +85,29 @@ c.send ("ARG"), c.send (argv[i]); c.send ("END"); + + auto_str tok; + + for (;;) + if (!c.recv (tok)) + { + fprintf (stderr, "protocol error: unexpected eof from server.\n"); + break; + } + else if (!strcmp (tok, "MSG") && c.recv (tok)) + fprintf (stderr, "%s", (const char *)tok); + 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); + break; + } + + return EXIT_FAILURE; }