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.46 by root, Sun Jun 15 13:54:15 2008 UTC vs.
Revision 1.58 by root, Sat Dec 17 23:17:33 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-2007 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"
… …
92 fcntl (fd, F_SETFL, O_NONBLOCK); 100 fcntl (fd, F_SETFL, O_NONBLOCK);
93 101
94 sa.sun_family = AF_UNIX; 102 sa.sun_family = AF_UNIX;
95 strcpy (sa.sun_path, sockname); 103 strcpy (sa.sun_path, sockname);
96 104
97 unlink (rxvt_connection::unix_sockname ()); 105 unlink (sockname);
98 106
99 mode_t omask = umask (0077); 107 mode_t omask = umask (0077);
100 108
101 if (bind (fd, (sockaddr *)&sa, sizeof (sa))) 109 if (bind (fd, (sockaddr *)&sa, sizeof (sa)))
102 { 110 {
… …
178 argv->push_back (strdup (tok)); 186 argv->push_back (strdup (tok));
179 else 187 else
180 return err ("protocol error: unexpected NEW token.\n"); 188 return err ("protocol error: unexpected NEW token.\n");
181 } 189 }
182 190
183 envv->push_back (0);
184
185 { 191 {
186 rxvt_term *term = new rxvt_term; 192 rxvt_term *term = new rxvt_term;
187 193
188 term->log_hook = &log_cb; 194 term->log_hook = &log_cb;
189 term->getfd_hook = &getfd_cb; 195 term->getfd_hook = &getfd_cb;
… …
214 } 220 }
215 else 221 else
216 return err (); 222 return err ();
217} 223}
218 224
219int opt_fork, opt_opendisplay, opt_quiet;
220
221int 225int
222main (int argc, const char *const *argv) 226main (int argc, char *argv[])
223{ 227{
224 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
225 234
226 for (int i = 1; i < argc; i++) 235 for (int i = 1; i < argc; i++)
227 { 236 {
228 if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork")) 237 if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork"))
229 opt_fork = 1; 238 opt_fork = 1;
230 else if (!strcmp (argv [i], "-o") || !strcmp (argv [i], "--opendisplay")) 239 else if (!strcmp (argv [i], "-o") || !strcmp (argv [i], "--opendisplay"))
231 opt_opendisplay = 1; 240 opt_opendisplay = 1;
232 else if (!strcmp (argv [i], "-q") || !strcmp (argv [i], "--quiet")) 241 else if (!strcmp (argv [i], "-q") || !strcmp (argv [i], "--quiet"))
233 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
234 else 247 else
235 { 248 {
236 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]);
237 return EXIT_FAILURE; 250 return EXIT_FAILURE;
238 } 251 }
239 } 252 }
240 253
254 rxvt_init ();
255
241 // optionally open display and never release it. 256 // optionally open display and never release it.
242 if (opt_opendisplay) 257 if (opt_opendisplay)
243 if (const char *dpy = getenv ("DISPLAY")) 258 if (const char *dpy = getenv ("DISPLAY"))
244 displays.get (dpy ? dpy : ":0"); // move string logic into rxvt_display maybe? 259 displays.get (dpy ? dpy : ":0"); // move string logic into rxvt_display maybe?
245 260
… …
254 fflush (stdout); 269 fflush (stdout);
255 } 270 }
256 271
257 free (sockname); 272 free (sockname);
258 273
274 pid_t pid = 0;
259 if (opt_fork) 275 if (opt_fork)
260 { 276 {
261 pid_t pid = fork (); 277 pid = fork ();
278 }
262 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 {
263 if (pid < 0) 289 if (pid < 0)
264 { 290 {
265 rxvt_log ("unable to fork daemon, aborting.\n"); 291 rxvt_log ("unable to fork daemon, aborting.\n");
266 return EXIT_FAILURE; 292 return EXIT_FAILURE;
267 } 293 }
268 else if (pid > 0) 294 else if (pid > 0)
269 _exit (EXIT_SUCCESS); 295 _exit (EXIT_SUCCESS);
270 296
271 ev_default_fork (); 297 ev_loop_fork (EV_DEFAULT_UC);
272 } 298 }
273 299
274 ev_loop (0); 300 ev_run ();
275 301
276 return EXIT_SUCCESS; 302 return EXIT_SUCCESS;
277} 303}
278 304

Diff Legend

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