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.45 by root, Tue Feb 19 18:58:05 2008 UTC vs.
Revision 1.64 by root, Thu Jun 17 00:08:35 2021 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 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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 <cstdio> 24#include <stdio.h>
25#include <cstdlib> 25#include <stdlib.h>
26#include <cstdarg> 26#include <stdarg.h>
27#include <cstring> 27#include <string.h>
28 28
29#include <unistd.h> 29#include <unistd.h>
30#include <fcntl.h> 30#include <fcntl.h>
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 <errno.h>
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"
41 49
42struct server : rxvt_connection { 50struct server : rxvt_connection
51{
43 log_callback log_cb; 52 log_callback log_cb;
44 getfd_callback getfd_cb; 53 getfd_callback getfd_cb;
45 54
46 void read_cb (ev::io &w, int revents); ev::io read_ev; 55 void read_cb (ev::io &w, int revents); ev::io read_ev;
47 void log_msg (const char *msg); 56 void log_msg (const char *msg);
… …
60 } 69 }
61 70
62 void err (const char *format = 0, ...); 71 void err (const char *format = 0, ...);
63}; 72};
64 73
65struct unix_listener { 74struct unix_listener
75{
66 int fd; 76 int fd;
67 77
68 void accept_cb (ev::io &w, int revents); ev::io accept_ev; 78 void accept_cb (ev::io &w, int revents); ev::io accept_ev;
69 79
80 unix_listener (int fd);
70 unix_listener (const char *sockname); 81 static int open (const char *sockname);
71}; 82};
72 83
73unix_listener::unix_listener (const char *sockname) 84unix_listener::unix_listener (int fd) : fd (fd)
74{ 85{
75 accept_ev.set<unix_listener, &unix_listener::accept_cb> (this); 86 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
85 if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
86 {
87 perror ("unable to create listening socket");
88 exit (EXIT_FAILURE);
89 }
90
91 fcntl (fd, F_SETFD, FD_CLOEXEC); 87 fcntl (fd, F_SETFD, FD_CLOEXEC);
92 fcntl (fd, F_SETFL, O_NONBLOCK); 88 fcntl (fd, F_SETFL, O_NONBLOCK);
89 accept_ev.start (fd, ev::READ);
90}
91
92int unix_listener::open (const char *sockname)
93{
94 sockaddr_un sa;
95
96 if (strlen (sockname) >= sizeof(sa.sun_path))
97 {
98 fputs ("socket name too long, aborting.\n", stderr);
99 exit (EXIT_FAILURE);
100 }
101
102 int fd;
103 if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
104 {
105 perror ("unable to create listening socket");
106 exit (EXIT_FAILURE);
107 }
93 108
94 sa.sun_family = AF_UNIX; 109 sa.sun_family = AF_UNIX;
95 strcpy (sa.sun_path, sockname); 110 strcpy (sa.sun_path, sockname);
96 111
97 unlink (rxvt_connection::unix_sockname ()); 112 unlink (sockname);
98 113
99 mode_t omask = umask (0077); 114 mode_t omask = umask (0077);
100 115
101 if (bind (fd, (sockaddr *)&sa, sizeof (sa))) 116 if (bind (fd, (sockaddr *)&sa, sizeof (sa)))
102 { 117 {
… …
110 { 125 {
111 perror ("unable to listen on socket"); 126 perror ("unable to listen on socket");
112 exit (EXIT_FAILURE); 127 exit (EXIT_FAILURE);
113 } 128 }
114 129
115 accept_ev.start (fd, ev::READ); 130 return fd;
116} 131}
117 132
118void unix_listener::accept_cb (ev::io &w, int revents) 133void unix_listener::accept_cb (ev::io &w, int revents)
119{ 134{
120 int fd2 = accept (fd, 0, 0); 135 int fd2 = accept (fd, 0, 0);
… …
172 187
173 if (!strcmp (tok, "END")) 188 if (!strcmp (tok, "END"))
174 break; 189 break;
175 else if (!strcmp (tok, "ENV") && recv (tok)) 190 else if (!strcmp (tok, "ENV") && recv (tok))
176 envv->push_back (strdup (tok)); 191 envv->push_back (strdup (tok));
177 else if (!strcmp (tok, "CWD") && recv (tok))
178 {
179 if (chdir (tok))
180 {
181 delete envv;
182 delete argv;
183 return err ("unable to change to working directory to '%s', aborting: %s.\n",
184 (char *)tok, strerror (errno));
185 }
186 }
187 else if (!strcmp (tok, "ARG") && recv (tok)) 192 else if (!strcmp (tok, "ARG") && recv (tok))
188 argv->push_back (strdup (tok)); 193 argv->push_back (strdup (tok));
189 else 194 else
190 return err ("protocol error: unexpected NEW token.\n"); 195 return err ("protocol error: unexpected NEW token.\n");
191 } 196 }
192
193 envv->push_back (0);
194 197
195 { 198 {
196 rxvt_term *term = new rxvt_term; 199 rxvt_term *term = new rxvt_term;
197 200
198 term->log_hook = &log_cb; 201 term->log_hook = &log_cb;
… …
209 success = false; 212 success = false;
210 } 213 }
211 214
212 term->log_hook = 0; 215 term->log_hook = 0;
213 216
214 chdir ("/"); 217 chdir ("/"); // init might change to different working directory
215 218
216 if (!success) 219 if (!success)
217 term->destroy (); 220 term->destroy ();
218 221
219 send ("END"); send (success ? 1 : 0); 222 send ("END"); send (success ? 1 : 0);
220 } 223 }
221 } 224 }
225 else if (!strcmp (tok, "QUIT"))
226 _exit (0);
222 else 227 else
223 return err ("protocol error: request '%s' unsupported.\n", (char *)tok); 228 return err ("protocol error: request '%s' unsupported.\n", (char *)tok);
224 } 229 }
225 else 230 else
226 return err (); 231 return err ();
227} 232}
228 233
229int opt_fork, opt_opendisplay, opt_quiet; 234#ifdef ENABLE_FRILLS
235enum {
236 SD_LISTEN_FDS_START = 3,
237};
238
239// https://www.freedesktop.org/software/systemd/man/sd_listen_fds.html
240// https://github.com/systemd/systemd/blob/main/src/libsystemd/sd-daemon/sd-daemon.c
241static int get_listen_fds ()
242{
243 const char *listen_pid = getenv ("LISTEN_PID");
244 if (!listen_pid)
245 return 0;
246
247 char *end;
248 errno = 0;
249 long pid = strtol (listen_pid, &end, 10);
250 if (errno || end == listen_pid || *end)
251 return -1;
252
253 if (getpid () != pid)
254 return 0;
255
256 const char *listen_fds = getenv ("LISTEN_FDS");
257 if (!listen_fds)
258 return 0;
259
260 errno = 0;
261 long n = strtol (listen_fds, &end, 10);
262 if (errno || end == listen_fds || *end)
263 return -1;
264
265 if (n <= 0 || n > INT_MAX - SD_LISTEN_FDS_START)
266 return -1;
267
268 unsetenv ("LISTEN_PID");
269 unsetenv ("LISTEN_FDS");
270 unsetenv ("LISTEN_FDNAMES");
271
272 return n;
273}
274#endif
230 275
231int 276int
232main (int argc, const char *const *argv) 277main (int argc, char *argv[])
233{ 278{
234 rxvt_init (); 279 ptytty::init ();
280
281 static char opt_fork, opt_opendisplay, opt_quiet;
282#if ENABLE_PERL
283 static char *opt_eval;
284#endif
285#if ENABLE_MLOCK
286 static char opt_lock;
287#endif
235 288
236 for (int i = 1; i < argc; i++) 289 for (int i = 1; i < argc; i++)
237 { 290 {
238 if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork")) 291 if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork"))
239 opt_fork = 1; 292 opt_fork = 1;
240 else if (!strcmp (argv [i], "-o") || !strcmp (argv [i], "--opendisplay")) 293 else if (!strcmp (argv [i], "-o") || !strcmp (argv [i], "--opendisplay"))
241 opt_opendisplay = 1; 294 opt_opendisplay = 1;
242 else if (!strcmp (argv [i], "-q") || !strcmp (argv [i], "--quiet")) 295 else if (!strcmp (argv [i], "-q") || !strcmp (argv [i], "--quiet"))
243 opt_quiet = 1; 296 opt_quiet = 1;
297#if ENABLE_MLOCK
298 else if (!strcmp (argv [i], "-m") || !strcmp (argv [i], "--mlock"))
299 opt_lock = 1;
300#endif
301#if ENABLE_PERL
302 else if (!strcmp (argv [i], "-e") || !strcmp (argv [i], "--eval"))
303 opt_eval = argv [++i];
304#endif
244 else 305 else
245 { 306 {
246 rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]); 307 rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]);
247 return EXIT_FAILURE; 308 return EXIT_FAILURE;
248 } 309 }
249 } 310 }
311
312 rxvt_init ();
313
314#if ENABLE_PERL
315 if (opt_eval)
316 {
317 rxvt_perl.init ();
318 rxvt_perl.eval (opt_eval);
319 }
320#endif
250 321
251 // optionally open display and never release it. 322 // optionally open display and never release it.
252 if (opt_opendisplay) 323 if (opt_opendisplay)
253 if (const char *dpy = getenv ("DISPLAY")) 324 if (const char *dpy = getenv ("DISPLAY"))
254 displays.get (dpy ? dpy : ":0"); // move string logic into rxvt_display maybe? 325 displays.get (dpy ? dpy : ":0"); // move string logic into rxvt_display maybe?
255 326
327 int fd;
328#ifdef ENABLE_FRILLS
329 int n = get_listen_fds ();
330 if (n > 1)
331 {
332 fputs ("received multiple file descriptors, aborting.\n", stderr);
333 exit (EXIT_FAILURE);
334 }
335 else if (n == 1)
336 {
337 fd = SD_LISTEN_FDS_START;
338 if (!opt_quiet)
339 {
340 printf ("rxvt-unicode daemon listening on fd.\n");
341 fflush (stdout);
342 }
343 }
344 else
345#endif
346 {
256 char *sockname = rxvt_connection::unix_sockname (); 347 char *sockname = rxvt_connection::unix_sockname ();
348 fd = unix_listener::open (sockname);
349 if (!opt_quiet)
350 {
351 printf ("rxvt-unicode daemon listening on %s.\n", sockname);
352 fflush (stdout);
353 }
354 free (sockname);
355 }
356
257 unix_listener l (sockname); 357 unix_listener l (fd);
258 358
259 chdir ("/"); 359 chdir ("/");
260 360
261 if (!opt_quiet) 361 pid_t pid = 0;
262 {
263 printf ("rxvt-unicode daemon listening on %s.\n", sockname);
264 fflush (stdout);
265 }
266
267 free (sockname);
268
269 if (opt_fork) 362 if (opt_fork)
270 { 363 {
271 pid_t pid = fork (); 364 pid = fork ();
365 }
272 366
367#if ENABLE_MLOCK
368 // Optionally perform an mlockall so this process does not get swapped out.
369 if (opt_lock && !pid)
370 if (mlockall (MCL_CURRENT | MCL_FUTURE) < 0)
371 perror ("unable to lock into ram");
372#endif
373
374 if (opt_fork)
375 {
273 if (pid < 0) 376 if (pid < 0)
274 { 377 {
275 rxvt_log ("unable to fork daemon, aborting.\n"); 378 rxvt_log ("unable to fork daemon, aborting.\n");
276 return EXIT_FAILURE; 379 return EXIT_FAILURE;
277 } 380 }
278 else if (pid > 0) 381 else if (pid > 0)
279 _exit (EXIT_SUCCESS); 382 _exit (EXIT_SUCCESS);
280 383
281 ev_default_fork (); 384 ev_loop_fork (EV_DEFAULT_UC);
282 } 385 }
283 386
284 ev_loop (0); 387 ev_run ();
285 388
286 return EXIT_SUCCESS; 389 return EXIT_SUCCESS;
287} 390}
288 391

Diff Legend

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