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.39 by root, Sat Nov 24 11:06:13 2007 UTC vs.
Revision 1.52 by root, Sun Oct 24 17:52:50 2010 UTC

1/*----------------------------------------------------------------------* 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-2006 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.
… …
31#include <sys/types.h> 31#include <sys/types.h>
32#include <sys/stat.h> 32#include <sys/stat.h>
33#include <sys/socket.h> 33#include <sys/socket.h>
34#include <sys/un.h> 34#include <sys/un.h>
35 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
36#include <cerrno> 44#include <cerrno>
37 45
38#include "rxvt.h" 46#include "rxvt.h"
39#include "rxvtdaemon.h" 47#include "rxvtdaemon.h"
40#include "libptytty.h" 48#include "libptytty.h"
… …
46 void read_cb (ev::io &w, int revents); ev::io read_ev; 54 void read_cb (ev::io &w, int revents); ev::io read_ev;
47 void log_msg (const char *msg); 55 void log_msg (const char *msg);
48 int getfd (int remote_fd); 56 int getfd (int remote_fd);
49 57
50 server (int fd) 58 server (int fd)
51 : read_ev (this, &server::read_cb),
52 log_cb (this, &server::log_msg),
53 getfd_cb (this, &server::getfd)
54 { 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
55 this->fd = fd; 64 this->fd = fd;
56 fcntl (fd, F_SETFD, FD_CLOEXEC); 65 fcntl (fd, F_SETFD, FD_CLOEXEC);
57 fcntl (fd, F_SETFL, 0); 66 fcntl (fd, F_SETFL, 0);
58 read_ev.start (fd, ev::READ); 67 read_ev.start (fd, ev::READ);
59 } 68 }
… …
68 77
69 unix_listener (const char *sockname); 78 unix_listener (const char *sockname);
70}; 79};
71 80
72unix_listener::unix_listener (const char *sockname) 81unix_listener::unix_listener (const char *sockname)
73: accept_ev (this, &unix_listener::accept_cb)
74{ 82{
83 accept_ev.set<unix_listener, &unix_listener::accept_cb> (this);
84
75 sockaddr_un sa; 85 sockaddr_un sa;
76 86
77 if (strlen (sockname) >= sizeof(sa.sun_path)) 87 if (strlen (sockname) >= sizeof(sa.sun_path))
78 { 88 {
79 fputs ("socket name too long, aborting.\n", stderr); 89 fputs ("socket name too long, aborting.\n", stderr);
… …
170 180
171 if (!strcmp (tok, "END")) 181 if (!strcmp (tok, "END"))
172 break; 182 break;
173 else if (!strcmp (tok, "ENV") && recv (tok)) 183 else if (!strcmp (tok, "ENV") && recv (tok))
174 envv->push_back (strdup (tok)); 184 envv->push_back (strdup (tok));
175 else if (!strcmp (tok, "CWD") && recv (tok))
176 {
177 if (chdir (tok))
178 {
179 delete envv;
180 delete argv;
181 return err ("unable to change to working directory to '%s', aborting: %s.\n",
182 (char *)tok, strerror (errno));
183 }
184 }
185 else if (!strcmp (tok, "ARG") && recv (tok)) 185 else if (!strcmp (tok, "ARG") && recv (tok))
186 argv->push_back (strdup (tok)); 186 argv->push_back (strdup (tok));
187 else 187 else
188 return err ("protocol error: unexpected NEW token.\n"); 188 return err ("protocol error: unexpected NEW token.\n");
189 } 189 }
… …
194 rxvt_term *term = new rxvt_term; 194 rxvt_term *term = new rxvt_term;
195 195
196 term->log_hook = &log_cb; 196 term->log_hook = &log_cb;
197 term->getfd_hook = &getfd_cb; 197 term->getfd_hook = &getfd_cb;
198 198
199 bool success; 199 bool success = true;
200 200
201 try 201 try
202 { 202 {
203 success = term->init (argv, envv); 203 term->init (argv, envv);
204 } 204 }
205 catch (const class rxvt_failure_exception &e) 205 catch (const class rxvt_failure_exception &e)
206 { 206 {
207 success = false; 207 success = false;
208 } 208 }
209 209
210 term->log_hook = 0; 210 term->log_hook = 0;
211 211
212 chdir ("/"); 212 chdir ("/"); // init might change to different working directory
213 213
214 if (!success) 214 if (!success)
215 term->destroy (); 215 term->destroy ();
216 216
217 send ("END"); send (success ? 1 : 0); 217 send ("END"); send (success ? 1 : 0);
… …
222 } 222 }
223 else 223 else
224 return err (); 224 return err ();
225} 225}
226 226
227int opt_fork, opt_opendisplay, opt_quiet;
228
229int 227int
230main (int argc, const char *const *argv) 228main (int argc, const char *const *argv)
231{ 229{
232 rxvt_init (); 230 ptytty::init ();
231
232 int opt_fork, opt_opendisplay, opt_quiet;
233#if ENABLE_MLOCK
234 int opt_lock;
235#endif
233 236
234 for (int i = 1; i < argc; i++) 237 for (int i = 1; i < argc; i++)
235 { 238 {
236 if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork")) 239 if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork"))
237 opt_fork = 1; 240 opt_fork = 1;
238 else if (!strcmp (argv [i], "-o") || !strcmp (argv [i], "--opendisplay")) 241 else if (!strcmp (argv [i], "-o") || !strcmp (argv [i], "--opendisplay"))
239 opt_opendisplay = 1; 242 opt_opendisplay = 1;
240 else if (!strcmp (argv [i], "-q") || !strcmp (argv [i], "--quiet")) 243 else if (!strcmp (argv [i], "-q") || !strcmp (argv [i], "--quiet"))
241 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
242 else 249 else
243 { 250 {
244 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]);
245 return EXIT_FAILURE; 252 return EXIT_FAILURE;
246 } 253 }
247 } 254 }
248 255
249 chdir ("/"); 256 rxvt_init ();
250 257
258 // optionally open display and never release it.
251 if (opt_opendisplay) 259 if (opt_opendisplay)
252 displays.get (getenv ("DISPLAY")); // open display and never release it 260 if (const char *dpy = getenv ("DISPLAY"))
261 displays.get (dpy ? dpy : ":0"); // move string logic into rxvt_display maybe?
253 262
254 char *sockname = rxvt_connection::unix_sockname (); 263 char *sockname = rxvt_connection::unix_sockname ();
255 unix_listener l (sockname); 264 unix_listener l (sockname);
256 265
266 chdir ("/");
267
257 if (!opt_quiet) 268 if (!opt_quiet)
258 { 269 {
259 printf ("rxvt-unicode daemon listening on %s.\n", sockname); 270 printf ("rxvt-unicode daemon listening on %s.\n", sockname);
260 fflush (stdout); 271 fflush (stdout);
261 } 272 }
262 273
263 free (sockname); 274 free (sockname);
264 275
276 pid_t pid = 0;
265 if (opt_fork) 277 if (opt_fork)
266 { 278 {
267 pid_t pid = fork (); 279 pid = fork ();
280 }
268 281
282#if ENABLE_MLOCK
283 // Optionally perform an mlockall so this process does not get swapped out.
284 if (opt_lock && !pid)
285 if (mlockall (MCL_CURRENT | MCL_FUTURE) < 0)
286 perror ("unable to lock into ram");
287#endif
288
289 if (opt_fork)
290 {
269 if (pid < 0) 291 if (pid < 0)
270 { 292 {
271 rxvt_log ("unable to fork daemon, aborting.\n"); 293 rxvt_log ("unable to fork daemon, aborting.\n");
272 return EXIT_FAILURE; 294 return EXIT_FAILURE;
273 } 295 }
274 else if (pid > 0) 296 else if (pid > 0)
275 _exit (EXIT_SUCCESS); 297 _exit (EXIT_SUCCESS);
276 298
277 ev_default_fork (); 299 ev_loop_fork (EV_DEFAULT_UC);
278 } 300 }
279 301
280 ev_loop (0); 302 ev_run ();
281 303
282 return EXIT_SUCCESS; 304 return EXIT_SUCCESS;
283} 305}
284 306

Diff Legend

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