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.8 by pcg, Wed Mar 17 05:15:02 2004 UTC

1#include "../config.h"
1#include "rxvtdaemon.h" 2#include "rxvtdaemon.h"
2 3
3#include <cstdio> 4#include <cstdio>
4#include <cstdlib> 5#include <cstdlib>
5 6
14 15
15client::client () 16client::client ()
16{ 17{
17 if ((fd = socket (PF_LOCAL, SOCK_STREAM, 0)) < 0) 18 if ((fd = socket (PF_LOCAL, SOCK_STREAM, 0)) < 0)
18 { 19 {
19 perror ("unable to create listening socket"); 20 perror ("unable to create communications socket");
20 exit (EXIT_FAILURE); 21 exit (EXIT_FAILURE);
21 } 22 }
22 23
24 char *sockname = rxvt_connection::unix_sockname ();
23 sockaddr_un sa; 25 sockaddr_un sa;
24
25 sa.sun_family = AF_UNIX; 26 sa.sun_family = AF_UNIX;
26 strcpy (sa.sun_path, rxvt_connection::unix_sockname ()); 27 strcpy (sa.sun_path, sockname);
28 free (sockname);
27 29
28 if (connect (fd, (sockaddr *)&sa, sizeof (sa))) 30 if (connect (fd, (sockaddr *)&sa, sizeof (sa)))
29 { 31 {
30 perror ("unable to bind listening socket"); 32 perror ("unable to connect to rxvtd");
31 exit (EXIT_FAILURE); 33 exit (EXIT_FAILURE);
32 } 34 }
33} 35}
34 36
35extern char **environ; 37extern char **environ;
36 38
37int 39int
38main(int argc, const char *const *argv) 40main (int argc, const char *const *argv)
39{ 41{
40 client c; 42 client c;
41 char buf[PATH_MAX]; 43 char buf[PATH_MAX];
42 44
43 { 45 {
44 sigset_t ss; 46 sigset_t ss;
45 47
48 sigemptyset (&ss);
46 sigaddset (&ss, SIGHUP); 49 sigaddset (&ss, SIGHUP);
47 sigprocmask (SIG_BLOCK, &ss, 0); 50 sigprocmask (SIG_BLOCK, &ss, 0);
48 } 51 }
49 52
50 c.send ("NEW"); 53 c.send ("NEW");
51 // instead of getcwd we could opendir(".") and pass the fd for fchdir *g* 54 // instead of getcwd we could opendir (".") and pass the fd for fchdir *g*
52 c.send ("CWD"), c.send (getcwd (buf, sizeof (buf))); 55 c.send ("CWD"), c.send (getcwd (buf, sizeof (buf)));
53 56
54 for (char **var = environ; *environ; environ++) 57 for (char **var = environ; *environ; environ++)
55 c.send ("ENV"), c.send (*environ); 58 c.send ("ENV"), c.send (*environ);
56 59
57 for (int i = 0; i < argc; i++) 60 for (int i = 0; i < argc; i++)
58 c.send ("ARG"), c.send (argv[i]); 61 c.send ("ARG"), c.send (argv[i]);
59 62
60 c.send ("END"); 63 c.send ("END");
64
65 auto_str tok;
66
67 for (;;)
68 if (!c.recv (tok))
69 {
70 fprintf (stderr, "protocol error: unexpected eof from server.\n");
71 break;
72 }
73 else if (!strcmp (tok, "MSG") && c.recv (tok))
74 fprintf (stderr, "%s", (const char *)tok);
75 else if (!strcmp (tok, "END"))
76 {
77 int success;
78 if (c.recv (success))
79 exit (success ? EXIT_SUCCESS : EXIT_FAILURE);
80 }
81 else
82 {
83 fprintf (stderr, "protocol error: received illegal token '%s'.\n", (const char *)tok);
84 break;
85 }
86
87 return EXIT_FAILURE;
61} 88}
62 89

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines