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.59 by sf-exg, Thu Jan 19 13:33:43 2012 UTC vs.
Revision 1.64 by root, Thu Jun 17 00:08:35 2021 UTC

… …
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 <schmorp@schmorp.de> 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
… …
45 45
46#include "rxvt.h" 46#include "rxvt.h"
47#include "rxvtdaemon.h" 47#include "rxvtdaemon.h"
48#include "libptytty.h" 48#include "libptytty.h"
49 49
50struct server : rxvt_connection { 50struct server : rxvt_connection
51{
51 log_callback log_cb; 52 log_callback log_cb;
52 getfd_callback getfd_cb; 53 getfd_callback getfd_cb;
53 54
54 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;
55 void log_msg (const char *msg); 56 void log_msg (const char *msg);
… …
68 } 69 }
69 70
70 void err (const char *format = 0, ...); 71 void err (const char *format = 0, ...);
71}; 72};
72 73
73struct unix_listener { 74struct unix_listener
75{
74 int fd; 76 int fd;
75 77
76 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;
77 79
80 unix_listener (int fd);
78 unix_listener (const char *sockname); 81 static int open (const char *sockname);
79}; 82};
80 83
81unix_listener::unix_listener (const char *sockname) 84unix_listener::unix_listener (int fd) : fd (fd)
82{ 85{
83 accept_ev.set<unix_listener, &unix_listener::accept_cb> (this); 86 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
93 if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
94 {
95 perror ("unable to create listening socket");
96 exit (EXIT_FAILURE);
97 }
98
99 fcntl (fd, F_SETFD, FD_CLOEXEC); 87 fcntl (fd, F_SETFD, FD_CLOEXEC);
100 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 }
101 108
102 sa.sun_family = AF_UNIX; 109 sa.sun_family = AF_UNIX;
103 strcpy (sa.sun_path, sockname); 110 strcpy (sa.sun_path, sockname);
104 111
105 unlink (sockname); 112 unlink (sockname);
… …
118 { 125 {
119 perror ("unable to listen on socket"); 126 perror ("unable to listen on socket");
120 exit (EXIT_FAILURE); 127 exit (EXIT_FAILURE);
121 } 128 }
122 129
123 accept_ev.start (fd, ev::READ); 130 return fd;
124} 131}
125 132
126void unix_listener::accept_cb (ev::io &w, int revents) 133void unix_listener::accept_cb (ev::io &w, int revents)
127{ 134{
128 int fd2 = accept (fd, 0, 0); 135 int fd2 = accept (fd, 0, 0);
… …
213 term->destroy (); 220 term->destroy ();
214 221
215 send ("END"); send (success ? 1 : 0); 222 send ("END"); send (success ? 1 : 0);
216 } 223 }
217 } 224 }
225 else if (!strcmp (tok, "QUIT"))
226 _exit (0);
218 else 227 else
219 return err ("protocol error: request '%s' unsupported.\n", (char *)tok); 228 return err ("protocol error: request '%s' unsupported.\n", (char *)tok);
220 } 229 }
221 else 230 else
222 return err (); 231 return err ();
223} 232}
224 233
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
275
225int 276int
226main (int argc, char *argv[]) 277main (int argc, char *argv[])
227{ 278{
228 ptytty::init (); 279 ptytty::init ();
229 280
230 static char opt_fork, opt_opendisplay, opt_quiet; 281 static char opt_fork, opt_opendisplay, opt_quiet;
282#if ENABLE_PERL
283 static char *opt_eval;
284#endif
231#if ENABLE_MLOCK 285#if ENABLE_MLOCK
232 static char opt_lock; 286 static char opt_lock;
233#endif 287#endif
234 288
235 for (int i = 1; i < argc; i++) 289 for (int i = 1; i < argc; i++)
… …
242 opt_quiet = 1; 296 opt_quiet = 1;
243#if ENABLE_MLOCK 297#if ENABLE_MLOCK
244 else if (!strcmp (argv [i], "-m") || !strcmp (argv [i], "--mlock")) 298 else if (!strcmp (argv [i], "-m") || !strcmp (argv [i], "--mlock"))
245 opt_lock = 1; 299 opt_lock = 1;
246#endif 300#endif
301#if ENABLE_PERL
302 else if (!strcmp (argv [i], "-e") || !strcmp (argv [i], "--eval"))
303 opt_eval = argv [++i];
304#endif
247 else 305 else
248 { 306 {
249 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]);
250 return EXIT_FAILURE; 308 return EXIT_FAILURE;
251 } 309 }
252 } 310 }
253 311
254 rxvt_init (); 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
255 321
256 // optionally open display and never release it. 322 // optionally open display and never release it.
257 if (opt_opendisplay) 323 if (opt_opendisplay)
258 if (const char *dpy = getenv ("DISPLAY")) 324 if (const char *dpy = getenv ("DISPLAY"))
259 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?
260 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 {
261 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
262 unix_listener l (sockname); 357 unix_listener l (fd);
263 358
264 chdir ("/"); 359 chdir ("/");
265
266 if (!opt_quiet)
267 {
268 printf ("rxvt-unicode daemon listening on %s.\n", sockname);
269 fflush (stdout);
270 }
271
272 free (sockname);
273 360
274 pid_t pid = 0; 361 pid_t pid = 0;
275 if (opt_fork) 362 if (opt_fork)
276 { 363 {
277 pid = fork (); 364 pid = fork ();

Diff Legend

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