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

Comparing rxvt-unicode/src/rxvtd.C (file contents):
Revision 1.1 by pcg, Mon Nov 24 17:28:08 2003 UTC vs.
Revision 1.25 by root, Tue Jan 17 15:43:49 2006 UTC

1/*--------------------------------*-C-*---------------------------------*
2 * File: rxvtd.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 "rxvtlib.h" 24#include "rxvt.h"
2#include "rxvtdaemon.h" 25#include "rxvtdaemon.h"
26#include "fdpass.h"
3#include "iom.h" 27#include "iom.h"
4 28
5#include <cstdio> 29#include <cstdio>
6#include <cstdlib> 30#include <cstdlib>
31#include <cstdarg>
32#include <cstring>
7 33
8#include <unistd.h> 34#include <unistd.h>
35#include <fcntl.h>
36#include <sys/types.h>
37#include <sys/stat.h>
9#include <sys/socket.h> 38#include <sys/socket.h>
10#include <sys/un.h> 39#include <sys/un.h>
11 40
41#include <cerrno>
42
43extern char **environ;
44
12struct server : rxvt_connection { 45struct server : rxvt_connection {
46 log_callback log_cb;
47 getfd_callback getfd_cb;
48
13 void read_cb (io_watcher &w, short revents); io_watcher read_ev; 49 void read_cb (io_watcher &w, short revents); io_watcher read_ev;
50 void log_msg (const char *msg);
51 int getfd (int remote_fd);
14 52
15 server (int fd) 53 server (int fd)
16 : read_ev (this, &server::read_cb) 54 : read_ev (this, &server::read_cb),
55 log_cb (this, &server::log_msg),
56 getfd_cb (this, &server::getfd)
17 { 57 {
18 this->fd = fd; 58 this->fd = fd;
19 read_ev.start (fd, EVENT_READ); 59 read_ev.start (fd, EVENT_READ);
20 } 60 }
21 61
22 void err (); 62 void err (const char *format = 0, ...);
23}; 63};
24 64
25struct listener { 65struct unix_listener {
26 int fd; 66 int fd;
27 67
28 void accept_cb (io_watcher &w, short revents); io_watcher accept_ev; 68 void accept_cb (io_watcher &w, short revents); io_watcher accept_ev;
29 69
30 listener (); 70 unix_listener (const char *sockname);
31}; 71};
32 72
33listener::listener () 73unix_listener::unix_listener (const char *sockname)
34: accept_ev (this, &listener::accept_cb) 74: accept_ev (this, &unix_listener::accept_cb)
35{ 75{
36 if ((fd = socket (PF_LOCAL, SOCK_STREAM, 0)) < 0) 76 if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
37 { 77 {
38 perror ("unable to create listening socket"); 78 perror ("unable to create listening socket");
39 exit (EXIT_FAILURE); 79 exit (EXIT_FAILURE);
40 } 80 }
41 81
82 fcntl (fd, F_SETFD, FD_CLOEXEC);
83
42 sockaddr_un sa; 84 sockaddr_un sa;
43 85
44 sa.sun_family = AF_UNIX; 86 sa.sun_family = AF_UNIX;
45 strcpy (sa.sun_path, rxvt_connection::unix_sockname ()); 87 strcpy (sa.sun_path, sockname);
46 88
47 unlink (rxvt_connection::unix_sockname ()); 89 unlink (rxvt_connection::unix_sockname ());
90
91 mode_t omask = umask (0077);
48 92
49 if (bind (fd, (sockaddr *)&sa, sizeof (sa))) 93 if (bind (fd, (sockaddr *)&sa, sizeof (sa)))
50 { 94 {
51 perror ("unable to bind listening socket"); 95 perror ("unable to bind listening socket");
52 exit (EXIT_FAILURE); 96 exit (EXIT_FAILURE);
53 } 97 }
54 98
99 umask (omask);
100
55 if (listen (fd, 5)) 101 if (listen (fd, 5))
56 { 102 {
57 perror ("unable to listen on socket"); 103 perror ("unable to listen on socket");
58 exit (EXIT_FAILURE); 104 exit (EXIT_FAILURE);
59 } 105 }
60 106
61 accept_ev.start (fd, EVENT_READ); 107 accept_ev.start (fd, EVENT_READ);
62} 108}
63 109
64void listener::accept_cb (io_watcher &w, short revents) 110void unix_listener::accept_cb (io_watcher &w, short revents)
65{ 111{
66 int fd2 = accept (fd, 0, 0); 112 int fd2 = accept (fd, 0, 0);
67 113
68 if (fd2 >= 0) 114 if (fd2 >= 0)
115 {
116 fcntl (fd2, F_SETFD, FD_CLOEXEC);
69 new server (fd2); 117 new server (fd2);
118 }
70} 119}
71 120
72void server::err () 121int server::getfd (int remote_fd)
73{ 122{
123 send ("GETFD");
124 send (remote_fd);
125 return rxvt_recv_fd (fd);
126}
127
128void server::log_msg (const char *msg)
129{
130 send ("MSG"), send (msg);
131}
132
133void server::err (const char *format, ...)
134{
135 if (format)
136 {
137 char err[1024];
138
139 va_list ap;
140 va_start (ap, format);
141 vsnprintf (err, 1024, format, ap);
142 va_end (ap);
143
144 send ("MSG"), send (err);
145 }
146
147 send ("END", 0);
74 close (fd); 148 close (fd);
75 delete this; 149 delete this;
76} 150}
77 151
78void server::read_cb (io_watcher &w, short revents) 152void server::read_cb (io_watcher &w, short revents)
79{ 153{
80 token cmd; 154 auto_str tok;
81 155
82 if (recv (cmd)) 156 if (recv (tok))
83 { 157 {
84 if (!strcmp (cmd, "NEW")) 158 if (!strcmp (tok, "NEW"))
85 { 159 {
160 stringvec *argv = new stringvec;
161 stringvec *envv = new stringvec;
162
163 for (;;)
164 {
165 if (!recv (tok))
166 return err ();
167
168 if (!strcmp (tok, "END"))
169 break;
170 else if (!strcmp (tok, "ENV") && recv (tok))
171 envv->push_back (tok.get ());
172 else if (!strcmp (tok, "CWD") && recv (tok))
173 {
174 if (chdir (tok))
175 err ("unable to change to working directory to '%s': %s",
176 (char *)tok, strerror (errno));
177 }
178 else if (!strcmp (tok, "ARG") && recv (tok))
179 argv->push_back (tok.get ());
180 else
181 return err ("protocol error: unexpected NEW token");
182 }
183
184 envv->push_back (0);
185
186 {
187 rxvt_term *term = new rxvt_term;
188
189 term->log_hook = &log_cb;
190 term->getfd_hook = &getfd_cb;
191 term->argv = argv;
192 term->envv = envv;
193
194 bool success;
195
196 try
197 {
198 success = term->init (argv->size (), argv->begin ());
199 }
200 catch (const class rxvt_failure_exception &e)
201 {
202 success = false;
203 }
204
205 term->log_hook = 0;
206
207 chdir ("/");
208
209 if (!success)
210 term->destroy ();
211
212 send ("END"); send (success ? 1 : 0);
213 }
86 } 214 }
87 else 215 else
88 err (); 216 return err ("protocol error: request '%s' unsupported.", (char *)tok);
89 } 217 }
90 else 218 else
91 err (); 219 return err ();
92} 220}
221
222int opt_fork, opt_opendisplay, opt_quiet;
93 223
94int 224int
95main(int argc, const char *const *argv) 225main (int argc, const char *const *argv)
96{ 226{
97 listener l; 227 rxvt_init ();
98 iom.loop ();
99 228
100#if 0 229 for (int i = 1; i < argc; i++)
101 if (rxvt_init(argc, argv) == NULL) 230 {
231 if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork"))
232 opt_fork = 1;
233 else if (!strcmp (argv [i], "-o") || !strcmp (argv [i], "--opendisplay"))
234 opt_opendisplay = 1;
235 else if (!strcmp (argv [i], "-q") || !strcmp (argv [i], "--quiet"))
236 opt_quiet = 1;
237 else
238 {
239 rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]);
102 return EXIT_FAILURE; 240 return EXIT_FAILURE;
241 }
242 }
243
244 chdir ("/");
103 245
104 dR; 246 if (opt_opendisplay)
105 rxvt_main_loop(aR); /* main processing loop */ 247 displays.get (getenv ("DISPLAY")); // open display and never release it
106#endif 248
249 char *sockname = rxvt_connection::unix_sockname ();
250 unix_listener l (sockname);
251
252 if (!opt_quiet)
253 {
254 printf ("rxvt-unicode daemon listening on %s.\n", sockname);
255 fflush (stdout);
256 }
257
258 free (sockname);
259
260 if (opt_fork)
261 {
262 pid_t pid = fork ();
263
264 if (pid < 0)
265 {
266 rxvt_log ("unable to fork daemon, aborting.\n");
267 return EXIT_FAILURE;
268 }
269 else if (pid > 0)
270 _exit (EXIT_SUCCESS);
271 }
272
273 io_manager::loop ();
274
107 return EXIT_SUCCESS; 275 return EXIT_SUCCESS;
108} 276}
277

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines