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.24 by root, Tue Jan 17 15:17:39 2006 UTC vs.
Revision 1.51 by root, Sun Oct 24 17:34:47 2010 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 "fdpass.h"
27#include "iom.h"
28
29#include <cstdio> 24#include <cstdio>
30#include <cstdlib> 25#include <cstdlib>
31#include <cstdarg> 26#include <cstdarg>
32#include <cstring> 27#include <cstring>
33 28
… …
36#include <sys/types.h> 31#include <sys/types.h>
37#include <sys/stat.h> 32#include <sys/stat.h>
38#include <sys/socket.h> 33#include <sys/socket.h>
39#include <sys/un.h> 34#include <sys/un.h>
40 35
36#if defined(ENABLE_FRILLS) && defined(_POSIX_MEMLOCK) && _POSIX_MEMLOCK > 0
37# define ENABLE_MLOCK 1
38#endif
39
40#if ENABLE_MLOCK
41# include <sys/mman.h>
42#endif
43
41#include <cerrno> 44#include <cerrno>
42 45
43extern char **environ; 46#include "rxvt.h"
47#include "rxvtdaemon.h"
48#include "libptytty.h"
44 49
45struct server : rxvt_connection { 50struct server : rxvt_connection {
46 log_callback log_cb; 51 log_callback log_cb;
47 getfd_callback getfd_cb; 52 getfd_callback getfd_cb;
48 53
49 void read_cb (io_watcher &w, short revents); io_watcher read_ev; 54 void read_cb (ev::io &w, int revents); ev::io read_ev;
50 void log_msg (const char *msg); 55 void log_msg (const char *msg);
51 int getfd (int remote_fd); 56 int getfd (int remote_fd);
52 57
53 server (int fd) 58 server (int fd)
54 : read_ev (this, &server::read_cb),
55 log_cb (this, &server::log_msg),
56 getfd_cb (this, &server::getfd)
57 { 59 {
60 read_ev.set <server, &server::read_cb> (this);
61 log_cb.set <server, &server::log_msg> (this);
62 getfd_cb.set<server, &server::getfd> (this);
63
58 this->fd = fd; 64 this->fd = fd;
65 fcntl (fd, F_SETFD, FD_CLOEXEC);
66 fcntl (fd, F_SETFL, 0);
59 read_ev.start (fd, EVENT_READ); 67 read_ev.start (fd, ev::READ);
60 } 68 }
61 69
62 void err (const char *format = 0, ...); 70 void err (const char *format = 0, ...);
63}; 71};
64 72
65struct unix_listener { 73struct unix_listener {
66 int fd; 74 int fd;
67 75
68 void accept_cb (io_watcher &w, short revents); io_watcher accept_ev; 76 void accept_cb (ev::io &w, int revents); ev::io accept_ev;
69 77
70 unix_listener (const char *sockname); 78 unix_listener (const char *sockname);
71}; 79};
72 80
73unix_listener::unix_listener (const char *sockname) 81unix_listener::unix_listener (const char *sockname)
74: accept_ev (this, &unix_listener::accept_cb)
75{ 82{
83 accept_ev.set<unix_listener, &unix_listener::accept_cb> (this);
84
85 sockaddr_un sa;
86
87 if (strlen (sockname) >= sizeof(sa.sun_path))
88 {
89 fputs ("socket name too long, aborting.\n", stderr);
90 exit (EXIT_FAILURE);
91 }
92
76 if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0) 93 if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
77 { 94 {
78 perror ("unable to create listening socket"); 95 perror ("unable to create listening socket");
79 exit (EXIT_FAILURE); 96 exit (EXIT_FAILURE);
80 } 97 }
81 98
82 fcntl (fd, F_SETFD, FD_CLOEXEC); 99 fcntl (fd, F_SETFD, FD_CLOEXEC);
83 100 fcntl (fd, F_SETFL, O_NONBLOCK);
84 sockaddr_un sa;
85 101
86 sa.sun_family = AF_UNIX; 102 sa.sun_family = AF_UNIX;
87 strcpy (sa.sun_path, sockname); 103 strcpy (sa.sun_path, sockname);
88 104
89 unlink (rxvt_connection::unix_sockname ()); 105 unlink (rxvt_connection::unix_sockname ());
… …
102 { 118 {
103 perror ("unable to listen on socket"); 119 perror ("unable to listen on socket");
104 exit (EXIT_FAILURE); 120 exit (EXIT_FAILURE);
105 } 121 }
106 122
107 accept_ev.start (fd, EVENT_READ); 123 accept_ev.start (fd, ev::READ);
108} 124}
109 125
110void unix_listener::accept_cb (io_watcher &w, short revents) 126void unix_listener::accept_cb (ev::io &w, int revents)
111{ 127{
112 int fd2 = accept (fd, 0, 0); 128 int fd2 = accept (fd, 0, 0);
113 129
114 if (fd2 >= 0) 130 if (fd2 >= 0)
115 {
116 fcntl (fd2, F_SETFD, FD_CLOEXEC);
117 new server (fd2); 131 new server (fd2);
118 }
119} 132}
120 133
121int server::getfd (int remote_fd) 134int server::getfd (int remote_fd)
122{ 135{
123 send ("GETFD"); 136 send ("GETFD");
124 send (remote_fd); 137 send (remote_fd);
125 return rxvt_recv_fd (fd); 138 return ptytty::recv_fd (fd);
126} 139}
127 140
128void server::log_msg (const char *msg) 141void server::log_msg (const char *msg)
129{ 142{
130 send ("MSG"), send (msg); 143 send ("MSG"), send (msg);
… …
139 va_list ap; 152 va_list ap;
140 va_start (ap, format); 153 va_start (ap, format);
141 vsnprintf (err, 1024, format, ap); 154 vsnprintf (err, 1024, format, ap);
142 va_end (ap); 155 va_end (ap);
143 156
144 send ("MSG"), send (err); 157 log_msg (err);
145 } 158 }
146 159
147 send ("END", 0); 160 send ("END"), send (0);
148 close (fd); 161 close (fd);
149 delete this; 162 delete this;
150} 163}
151 164
152void server::read_cb (io_watcher &w, short revents) 165void server::read_cb (ev::io &w, int revents)
153{ 166{
154 auto_str tok; 167 auto_str tok;
155 168
156 if (recv (tok)) 169 if (recv (tok))
157 { 170 {
158 if (!strcmp (tok, "NEW")) 171 if (!strcmp (tok, "NEW"))
159 { 172 {
160 stringvec *argv = new stringvec; 173 stringvec *argv = new stringvec;
161 stringvec *envv = new stringvec; 174 stringvec *envv = new stringvec;
162 175
163 for (;;) 176 for (;;)
164 { 177 {
165 if (!recv (tok)) 178 if (!recv (tok))
166 return err (); 179 return err ();
167 180
168 if (!strcmp (tok, "END")) 181 if (!strcmp (tok, "END"))
169 break; 182 break;
170 else if (!strcmp (tok, "ENV") && recv (tok)) 183 else if (!strcmp (tok, "ENV") && recv (tok))
171 envv->push_back (tok.get ()); 184 envv->push_back (strdup (tok));
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)) 185 else if (!strcmp (tok, "ARG") && recv (tok))
179 argv->push_back (tok.get ()); 186 argv->push_back (strdup (tok));
180 else 187 else
181 return err ("protocol error: unexpected NEW token"); 188 return err ("protocol error: unexpected NEW token.\n");
182 } 189 }
183 190
184 envv->push_back (0); 191 envv->push_back (0);
185 192
186 { 193 {
187 rxvt_term *term = new rxvt_term; 194 rxvt_term *term = new rxvt_term;
188 195
189 term->log_hook = &log_cb; 196 term->log_hook = &log_cb;
190 term->getfd_hook = &getfd_cb; 197 term->getfd_hook = &getfd_cb;
191 term->argv = argv;
192 term->envv = envv;
193 198
194 bool success; 199 bool success = true;
195 200
196 try 201 try
197 { 202 {
198 success = term->init (argv->size (), argv->begin ()); 203 term->init (argv, envv);
199 } 204 }
200 catch (const class rxvt_failure_exception &e) 205 catch (const class rxvt_failure_exception &e)
201 { 206 {
202 success = false; 207 success = false;
203 } 208 }
204 209
205 term->log_hook = 0; 210 term->log_hook = 0;
206 211
207 chdir ("/"); 212 chdir ("/"); // init might change to different working directory
208 213
209 if (!success) 214 if (!success)
210 term->destroy (); 215 term->destroy ();
211 216
212 send ("END"); send (success ? 1 : 0); 217 send ("END"); send (success ? 1 : 0);
213 } 218 }
214 } 219 }
215 else 220 else
216 return err ("protocol error: request '%s' unsupported.", (char *)tok); 221 return err ("protocol error: request '%s' unsupported.\n", (char *)tok);
217 } 222 }
218 else 223 else
219 return err (); 224 return err ();
220} 225}
221 226
222int opt_fork, opt_opendisplay, opt_quiet;
223
224int 227int
225main (int argc, const char *const *argv) 228main (int argc, const char *const *argv)
226{ 229{
230 int opt_fork, opt_opendisplay, opt_quiet;
231#if ENABLE_MLOCK
232 int opt_lock;
233#endif
234
235 rxvt_init ();
236
227 for (int i = 1; i < argc; i++) 237 for (int i = 1; i < argc; i++)
228 { 238 {
229 if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork")) 239 if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork"))
230 opt_fork = 1; 240 opt_fork = 1;
231 else if (!strcmp (argv [i], "-o") || !strcmp (argv [i], "--opendisplay")) 241 else if (!strcmp (argv [i], "-o") || !strcmp (argv [i], "--opendisplay"))
232 opt_opendisplay = 1; 242 opt_opendisplay = 1;
233 else if (!strcmp (argv [i], "-q") || !strcmp (argv [i], "--quiet")) 243 else if (!strcmp (argv [i], "-q") || !strcmp (argv [i], "--quiet"))
234 opt_quiet = 1; 244 opt_quiet = 1;
245#if ENABLE_MLOCK
246 else if (!strcmp (argv [i], "-m") || !strcmp (argv [i], "--mlock"))
247 opt_lock = 1;
248#endif
235 else 249 else
236 { 250 {
237 rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]); 251 rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]);
238 return EXIT_FAILURE; 252 return EXIT_FAILURE;
239 } 253 }
240 } 254 }
241
242 rxvt_init ();
243 255
244 chdir ("/"); 256 // optionally open display and never release it.
245
246 if (opt_opendisplay) 257 if (opt_opendisplay)
247 displays.get (getenv ("DISPLAY")); // open display and never release it 258 if (const char *dpy = getenv ("DISPLAY"))
259 displays.get (dpy ? dpy : ":0"); // move string logic into rxvt_display maybe?
248 260
249 char *sockname = rxvt_connection::unix_sockname (); 261 char *sockname = rxvt_connection::unix_sockname ();
250 unix_listener l (sockname); 262 unix_listener l (sockname);
251 263
264 chdir ("/");
265
252 if (!opt_quiet) 266 if (!opt_quiet)
253 { 267 {
254 printf ("rxvt-unicode daemon listening on %s.\n", sockname); 268 printf ("rxvt-unicode daemon listening on %s.\n", sockname);
255 fflush (stdout); 269 fflush (stdout);
256 } 270 }
257 271
258 free (sockname); 272 free (sockname);
259 273
274 pid_t pid = 0;
260 if (opt_fork) 275 if (opt_fork)
261 { 276 {
262 pid_t pid = fork (); 277 pid = fork ();
278 }
263 279
280#if ENABLE_MLOCK
281 // Optionally perform an mlockall so this process does not get swapped out.
282 if (opt_lock && !pid)
283 if (mlockall (MCL_CURRENT | MCL_FUTURE) < 0)
284 perror ("unable to lock into ram");
285#endif
286
287 if (opt_fork)
288 {
264 if (pid < 0) 289 if (pid < 0)
265 { 290 {
266 rxvt_log ("unable to fork daemon, aborting.\n"); 291 rxvt_log ("unable to fork daemon, aborting.\n");
267 return EXIT_FAILURE; 292 return EXIT_FAILURE;
268 } 293 }
269 else if (pid > 0) 294 else if (pid > 0)
270 _exit (EXIT_SUCCESS); 295 _exit (EXIT_SUCCESS);
271 }
272 296
273 io_manager::loop (); 297 ev_loop_fork (EV_DEFAULT_UC);
298 }
299
300 ev_run ();
274 301
275 return EXIT_SUCCESS; 302 return EXIT_SUCCESS;
276} 303}
277 304

Diff Legend

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