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.2 by pcg, Mon Nov 24 19:52:16 2003 UTC vs.
Revision 1.18 by root, Sat Dec 24 11:55:41 2005 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#include "fdpass.h"
26
27#include "rxvt.h"
2 28
3#include <cstdio> 29#include <cstdio>
4#include <cstdlib> 30#include <cstdlib>
31#include <cstring>
32#include <csignal>
5 33
6#include <unistd.h> 34#include <unistd.h>
7#include <sys/socket.h> 35#include <sys/socket.h>
8#include <sys/un.h> 36#include <sys/un.h>
9 37
11 client (); 39 client ();
12}; 40};
13 41
14client::client () 42client::client ()
15{ 43{
16 if ((fd = socket (PF_LOCAL, SOCK_STREAM, 0)) < 0) 44 if ((fd = socket (PF_UNIX, SOCK_STREAM, 0)) < 0)
17 { 45 {
18 perror ("unable to create listening socket"); 46 perror ("unable to create communications socket");
19 exit (EXIT_FAILURE); 47 exit (EXIT_FAILURE);
20 } 48 }
21 49
50 char *sockname = rxvt_connection::unix_sockname ();
22 sockaddr_un sa; 51 sockaddr_un sa;
23
24 sa.sun_family = AF_UNIX; 52 sa.sun_family = AF_UNIX;
25 strcpy (sa.sun_path, rxvt_connection::unix_sockname ()); 53 strcpy (sa.sun_path, sockname);
54 free (sockname);
26 55
27 if (connect (fd, (sockaddr *)&sa, sizeof (sa))) 56 if (connect (fd, (sockaddr *)&sa, sizeof (sa)))
28 { 57 {
29 perror ("unable to bind listening socket"); 58 perror ("unable to connect to the rxvt-unicode daemon");
30 exit (EXIT_FAILURE); 59 exit (EXIT_FAILURE);
31 } 60 }
32} 61}
33 62
63extern char **environ;
64
34int 65int
35main(int argc, const char *const *argv) 66main (int argc, const char *const *argv)
36{ 67{
37 client c; 68 client c;
38 char buf[PATH_MAX]; 69 {
70 sigset_t ss;
71
72 sigemptyset (&ss);
73 sigaddset (&ss, SIGHUP);
74 sigprocmask (SIG_BLOCK, &ss, 0);
75 }
39 76
40 c.send ("NEW"); 77 c.send ("NEW");
41 c.send ("DISPLAY"), c.send (getenv ("DISPLAY"));
42 // instead of getcwd we could opendir(".") and pass the fd for fchdir *g*
43 c.send ("CWD"), c.send (getcwd (buf, sizeof (buf)));
44 78
79 // instead of getcwd we could opendir (".") and pass the fd for fchdir *g*
80 char cwd[PATH_MAX];
81
82 if (!getcwd (cwd, sizeof (cwd)))
83 {
84 perror ("unable to determine current working directory");
85 exit (EXIT_FAILURE);
86 }
87
88 c.send ("CWD"), c.send (cwd);
89
90 for (char **var = environ; *var; var++)
91 c.send ("ENV"), c.send (*var);
92
93 const char *base = strrchr (argv[0], '/');
94 base = base ? base + 1 : argv[0];
95 c.send ("ARG"), c.send (strcmp (base, RXVTNAME "c") ? base : RXVTNAME);
96
45 for (int i = 0; i < argc; i++) 97 for (int i = 1; i < argc; i++)
46 c.send ("ARG"), c.send (argv[i]); 98 c.send ("ARG"), c.send (argv[i]);
47 99
48 c.send ("END"); 100 c.send ("END");
101
102 auto_str tok;
103 int cint;
104
105 for (;;)
106 if (!c.recv (tok))
107 {
108 fprintf (stderr, "protocol error: unexpected eof from server.\n");
109 break;
110 }
111 else if (!strcmp (tok, "MSG") && c.recv (tok))
112 fprintf (stderr, "%s", (const char *)tok);
113#if ENABLE_FRILLS && HAVE_UNIX_FDPASS
114 else if (!strcmp (tok, "GETFD") && c.recv (cint))
115 {
116 if (rxvt_send_fd (c.fd, cint) < 0)
117 {
118 fprintf (stderr, "unable to send fd %d: ", cint); perror (0);
119 exit (EXIT_FAILURE);
120 }
121 }
122#endif
123 else if (!strcmp (tok, "END"))
124 {
125 int success;
126 if (c.recv (success))
127 exit (success ? EXIT_SUCCESS : EXIT_FAILURE);
128 }
129 else
130 {
131 fprintf (stderr, "protocol error: received unsupported token '%s'.\n", (const char *)tok);
132 break;
133 }
134
135 return EXIT_FAILURE;
49} 136}
50 137

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines