ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtc.C
(Generate patch)

Comparing rxvt-unicode/src/rxvtc.C (file contents):
Revision 1.3 by pcg, Tue Nov 25 11:52:42 2003 UTC vs.
Revision 1.11 by pcg, Thu Apr 8 20:31:45 2004 UTC

1/*--------------------------------*-C-*---------------------------------*
2 * File: rxvtc.C
3 *----------------------------------------------------------------------*
4 *
5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
7 *
8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version.
12 *
13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details.
17 *
18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 *----------------------------------------------------------------------*/
22
23#include "../config.h"
1#include "rxvtdaemon.h" 24#include "rxvtdaemon.h"
25
26#include "rxvt.h"
2 27
3#include <cstdio> 28#include <cstdio>
4#include <cstdlib> 29#include <cstdlib>
5 30
6#include <unistd.h> 31#include <unistd.h>
12 client (); 37 client ();
13}; 38};
14 39
15client::client () 40client::client ()
16{ 41{
17 if ((fd = socket (PF_LOCAL, SOCK_STREAM, 0)) < 0) 42 if ((fd = socket (PF_UNIX, SOCK_STREAM, 0)) < 0)
18 { 43 {
19 perror ("unable to create listening socket"); 44 perror ("unable to create communications socket");
20 exit (EXIT_FAILURE); 45 exit (EXIT_FAILURE);
21 } 46 }
22 47
48 char *sockname = rxvt_connection::unix_sockname ();
23 sockaddr_un sa; 49 sockaddr_un sa;
24
25 sa.sun_family = AF_UNIX; 50 sa.sun_family = AF_UNIX;
26 strcpy (sa.sun_path, rxvt_connection::unix_sockname ()); 51 strcpy (sa.sun_path, sockname);
52 free (sockname);
27 53
28 if (connect (fd, (sockaddr *)&sa, sizeof (sa))) 54 if (connect (fd, (sockaddr *)&sa, sizeof (sa)))
29 { 55 {
30 perror ("unable to bind listening socket"); 56 perror ("unable to connect to rxvtd");
31 exit (EXIT_FAILURE); 57 exit (EXIT_FAILURE);
32 } 58 }
33} 59}
34 60
35extern char **environ; 61extern char **environ;
36 62
37int 63int
38main(int argc, const char *const *argv) 64main (int argc, const char *const *argv)
39{ 65{
40 client c; 66 client c;
41 char buf[PATH_MAX]; 67 char buf[PATH_MAX];
42 68
43 { 69 {
44 sigset_t ss; 70 sigset_t ss;
45 71
72 sigemptyset (&ss);
46 sigaddset (&ss, SIGHUP); 73 sigaddset (&ss, SIGHUP);
47 sigprocmask (SIG_BLOCK, &ss, 0); 74 sigprocmask (SIG_BLOCK, &ss, 0);
48 } 75 }
49 76
50 c.send ("NEW"); 77 c.send ("NEW");
51 // instead of getcwd we could opendir(".") and pass the fd for fchdir *g* 78 // instead of getcwd we could opendir (".") and pass the fd for fchdir *g*
52 c.send ("CWD"), c.send (getcwd (buf, sizeof (buf))); 79 c.send ("CWD"), c.send (getcwd (buf, sizeof (buf)));
53 80
54 for (char **var = environ; *environ; environ++) 81 for (char **var = environ; *environ; environ++)
55 c.send ("ENV"), c.send (*environ); 82 c.send ("ENV"), c.send (*environ);
56 83
57 for (int i = 0; i < argc; i++) 84 for (int i = 0; i < argc; i++)
58 c.send ("ARG"), c.send (argv[i]); 85 c.send ("ARG"), c.send (argv[i]);
59 86
60 c.send ("END"); 87 c.send ("END");
88
89 auto_str tok;
90
91 for (;;)
92 if (!c.recv (tok))
93 {
94 fprintf (stderr, "protocol error: unexpected eof from server.\n");
95 break;
96 }
97 else if (!strcmp (tok, "MSG") && c.recv (tok))
98 fprintf (stderr, "%s", (const char *)tok);
99 else if (!strcmp (tok, "END"))
100 {
101 int success;
102 if (c.recv (success))
103 exit (success ? EXIT_SUCCESS : EXIT_FAILURE);
104 }
105 else
106 {
107 fprintf (stderr, "protocol error: received illegal token '%s'.\n", (const char *)tok);
108 break;
109 }
110
111 return EXIT_FAILURE;
61} 112}
62 113

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines