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.16 by root, Sun Aug 15 02:17:32 2004 UTC vs.
Revision 1.44 by root, Tue Feb 19 13:37:17 2008 UTC

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

Diff Legend

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