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.40 by root, Tue Dec 4 14:50:43 2007 UTC vs.
Revision 1.57 by sf-exg, Tue Dec 6 11:29:52 2011 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 <schmorp@schmorp.de>
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 { 59 {
53 callback_set (log_cb , this, server, log_msg); 60 read_ev.set <server, &server::read_cb> (this);
54 callback_set (getfd_cb, this, server, getfd); 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);
… …
90 fcntl (fd, F_SETFL, O_NONBLOCK); 100 fcntl (fd, F_SETFL, O_NONBLOCK);
91 101
92 sa.sun_family = AF_UNIX; 102 sa.sun_family = AF_UNIX;
93 strcpy (sa.sun_path, sockname); 103 strcpy (sa.sun_path, sockname);
94 104
95 unlink (rxvt_connection::unix_sockname ()); 105 unlink (sockname);
96 106
97 mode_t omask = umask (0077); 107 mode_t omask = umask (0077);
98 108
99 if (bind (fd, (sockaddr *)&sa, sizeof (sa))) 109 if (bind (fd, (sockaddr *)&sa, sizeof (sa)))
100 { 110 {
… …
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 }
190 190
191 envv->push_back (0);
192
193 { 191 {
194 rxvt_term *term = new rxvt_term; 192 rxvt_term *term = new rxvt_term;
195 193
196 term->log_hook = &log_cb; 194 term->log_hook = &log_cb;
197 term->getfd_hook = &getfd_cb; 195 term->getfd_hook = &getfd_cb;
198 196
199 bool success; 197 bool success = true;
200 198
201 try 199 try
202 { 200 {
203 success = term->init (argv, envv); 201 term->init (argv, envv);
204 } 202 }
205 catch (const class rxvt_failure_exception &e) 203 catch (const class rxvt_failure_exception &e)
206 { 204 {
207 success = false; 205 success = false;
208 } 206 }
209 207
210 term->log_hook = 0; 208 term->log_hook = 0;
211 209
212 chdir ("/"); 210 chdir ("/"); // init might change to different working directory
213 211
214 if (!success) 212 if (!success)
215 term->destroy (); 213 term->destroy ();
216 214
217 send ("END"); send (success ? 1 : 0); 215 send ("END"); send (success ? 1 : 0);
… …
222 } 220 }
223 else 221 else
224 return err (); 222 return err ();
225} 223}
226 224
227int opt_fork, opt_opendisplay, opt_quiet;
228
229int 225int
230main (int argc, const char *const *argv) 226main (int argc, const char *const *argv)
231{ 227{
232 rxvt_init (); 228 ptytty::init ();
229
230 static char opt_fork, opt_opendisplay, opt_quiet;
231#if ENABLE_MLOCK
232 static char opt_lock;
233#endif
233 234
234 for (int i = 1; i < argc; i++) 235 for (int i = 1; i < argc; i++)
235 { 236 {
236 if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork")) 237 if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork"))
237 opt_fork = 1; 238 opt_fork = 1;
238 else if (!strcmp (argv [i], "-o") || !strcmp (argv [i], "--opendisplay")) 239 else if (!strcmp (argv [i], "-o") || !strcmp (argv [i], "--opendisplay"))
239 opt_opendisplay = 1; 240 opt_opendisplay = 1;
240 else if (!strcmp (argv [i], "-q") || !strcmp (argv [i], "--quiet")) 241 else if (!strcmp (argv [i], "-q") || !strcmp (argv [i], "--quiet"))
241 opt_quiet = 1; 242 opt_quiet = 1;
243#if ENABLE_MLOCK
244 else if (!strcmp (argv [i], "-m") || !strcmp (argv [i], "--mlock"))
245 opt_lock = 1;
246#endif
242 else 247 else
243 { 248 {
244 rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]); 249 rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]);
245 return EXIT_FAILURE; 250 return EXIT_FAILURE;
246 } 251 }
247 } 252 }
248 253
249 chdir ("/"); 254 rxvt_init ();
250 255
256 // optionally open display and never release it.
251 if (opt_opendisplay) 257 if (opt_opendisplay)
252 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?
253 260
254 char *sockname = rxvt_connection::unix_sockname (); 261 char *sockname = rxvt_connection::unix_sockname ();
255 unix_listener l (sockname); 262 unix_listener l (sockname);
256 263
264 chdir ("/");
265
257 if (!opt_quiet) 266 if (!opt_quiet)
258 { 267 {
259 printf ("rxvt-unicode daemon listening on %s.\n", sockname); 268 printf ("rxvt-unicode daemon listening on %s.\n", sockname);
260 fflush (stdout); 269 fflush (stdout);
261 } 270 }
262 271
263 free (sockname); 272 free (sockname);
264 273
274 pid_t pid = 0;
265 if (opt_fork) 275 if (opt_fork)
266 { 276 {
267 pid_t pid = fork (); 277 pid = fork ();
278 }
268 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 {
269 if (pid < 0) 289 if (pid < 0)
270 { 290 {
271 rxvt_log ("unable to fork daemon, aborting.\n"); 291 rxvt_log ("unable to fork daemon, aborting.\n");
272 return EXIT_FAILURE; 292 return EXIT_FAILURE;
273 } 293 }
274 else if (pid > 0) 294 else if (pid > 0)
275 _exit (EXIT_SUCCESS); 295 _exit (EXIT_SUCCESS);
276 296
277 ev_default_fork (); 297 ev_loop_fork (EV_DEFAULT_UC);
278 } 298 }
279 299
280 ev_loop (0); 300 ev_run ();
281 301
282 return EXIT_SUCCESS; 302 return EXIT_SUCCESS;
283} 303}
284 304

Diff Legend

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