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.62 by sf-exg, Mon Oct 6 11:14:49 2014 UTC vs.
Revision 1.67 by sf-exg, Fri Jul 23 19:18:52 2021 UTC

… …
41# include <sys/mman.h> 41# include <sys/mman.h>
42#endif 42#endif
43 43
44#include <errno.h> 44#include <errno.h>
45 45
46#include <libptytty.h>
47
46#include "rxvt.h" 48#include "rxvt.h"
47#include "rxvtdaemon.h" 49#include "rxvtdaemon.h"
48#include "libptytty.h"
49 50
50struct server : rxvt_connection { 51struct server : rxvt_connection
52{
51 log_callback log_cb; 53 log_callback log_cb;
52 getfd_callback getfd_cb; 54 getfd_callback getfd_cb;
53 55
54 void read_cb (ev::io &w, int revents); ev::io read_ev; 56 void read_cb (ev::io &w, int revents); ev::io read_ev;
55 void log_msg (const char *msg); 57 void log_msg (const char *msg);
… …
68 } 70 }
69 71
70 void err (const char *format = 0, ...); 72 void err (const char *format = 0, ...);
71}; 73};
72 74
73struct unix_listener { 75struct unix_listener
76{
74 int fd; 77 int fd;
75 78
76 void accept_cb (ev::io &w, int revents); ev::io accept_ev; 79 void accept_cb (ev::io &w, int revents); ev::io accept_ev;
77 80
81 unix_listener (int fd);
78 unix_listener (const char *sockname); 82 static int open (const char *sockname);
79}; 83};
80 84
81unix_listener::unix_listener (const char *sockname) 85unix_listener::unix_listener (int fd) : fd (fd)
82{ 86{
83 accept_ev.set<unix_listener, &unix_listener::accept_cb> (this); 87 accept_ev.set<unix_listener, &unix_listener::accept_cb> (this);
88 fcntl (fd, F_SETFD, FD_CLOEXEC);
89 fcntl (fd, F_SETFL, O_NONBLOCK);
90 accept_ev.start (fd, ev::READ);
91}
84 92
93int unix_listener::open (const char *sockname)
94{
85 sockaddr_un sa; 95 sockaddr_un sa;
86 96
87 if (strlen (sockname) >= sizeof(sa.sun_path)) 97 if (strlen (sockname) >= sizeof(sa.sun_path))
88 { 98 {
89 fputs ("socket name too long, aborting.\n", stderr); 99 fputs ("socket name too long, aborting.\n", stderr);
90 exit (EXIT_FAILURE); 100 exit (EXIT_FAILURE);
91 } 101 }
92 102
103 int fd;
93 if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0) 104 if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
94 { 105 {
95 perror ("unable to create listening socket"); 106 perror ("unable to create listening socket");
96 exit (EXIT_FAILURE); 107 exit (EXIT_FAILURE);
97 } 108 }
98 109
99 fcntl (fd, F_SETFD, FD_CLOEXEC);
100 fcntl (fd, F_SETFL, O_NONBLOCK);
101
102 sa.sun_family = AF_UNIX; 110 sa.sun_family = AF_UNIX;
103 strcpy (sa.sun_path, sockname); 111 strcpy (sa.sun_path, sockname);
104 112
105 unlink (sockname); 113 unlink (sockname);
106 114
… …
118 { 126 {
119 perror ("unable to listen on socket"); 127 perror ("unable to listen on socket");
120 exit (EXIT_FAILURE); 128 exit (EXIT_FAILURE);
121 } 129 }
122 130
123 accept_ev.start (fd, ev::READ); 131 return fd;
124} 132}
125 133
126void unix_listener::accept_cb (ev::io &w, int revents) 134void unix_listener::accept_cb (ev::io &w, int revents)
127{ 135{
128 int fd2 = accept (fd, 0, 0); 136 int fd2 = accept (fd, 0, 0);
… …
198 206
199 try 207 try
200 { 208 {
201 term->init (argv, envv); 209 term->init (argv, envv);
202 } 210 }
203 catch (const class rxvt_failure_exception &e) 211 catch (const std::exception &e)
204 { 212 {
213 log_msg (e.what());
205 success = false; 214 success = false;
206 } 215 }
207 216
208 term->log_hook = 0; 217 term->log_hook = 0;
209 218
… …
222 } 231 }
223 else 232 else
224 return err (); 233 return err ();
225} 234}
226 235
236#ifdef ENABLE_FRILLS
237enum {
238 SD_LISTEN_FDS_START = 3,
239};
240
241// https://www.freedesktop.org/software/systemd/man/sd_listen_fds.html
242// https://github.com/systemd/systemd/blob/main/src/libsystemd/sd-daemon/sd-daemon.c
243static int get_listen_fds ()
244{
245 const char *listen_pid = getenv ("LISTEN_PID");
246 if (!listen_pid)
247 return 0;
248
249 char *end;
250 errno = 0;
251 long pid = strtol (listen_pid, &end, 10);
252 if (errno || end == listen_pid || *end)
253 return -1;
254
255 if (getpid () != pid)
256 return 0;
257
258 const char *listen_fds = getenv ("LISTEN_FDS");
259 if (!listen_fds)
260 return 0;
261
262 errno = 0;
263 long n = strtol (listen_fds, &end, 10);
264 if (errno || end == listen_fds || *end)
265 return -1;
266
267 if (n <= 0 || n > INT_MAX - SD_LISTEN_FDS_START)
268 return -1;
269
270 unsetenv ("LISTEN_PID");
271 unsetenv ("LISTEN_FDS");
272 unsetenv ("LISTEN_FDNAMES");
273
274 return n;
275}
276#endif
277
227int 278int
228main (int argc, char *argv[]) 279main (int argc, char *argv[])
229{ 280{
281 try
282 {
230 ptytty::init (); 283 ptytty::init ();
284 }
285 catch (const std::exception &e)
286 {
287 fputs (e.what (), stderr);
288 return EXIT_FAILURE;
289 }
231 290
232 static char opt_fork, opt_opendisplay, opt_quiet; 291 static char opt_fork, opt_opendisplay, opt_quiet;
233#if ENABLE_PERL 292#if ENABLE_PERL
234 static char *opt_eval; 293 static char *opt_eval;
235#endif 294#endif
… …
273 // optionally open display and never release it. 332 // optionally open display and never release it.
274 if (opt_opendisplay) 333 if (opt_opendisplay)
275 if (const char *dpy = getenv ("DISPLAY")) 334 if (const char *dpy = getenv ("DISPLAY"))
276 displays.get (dpy ? dpy : ":0"); // move string logic into rxvt_display maybe? 335 displays.get (dpy ? dpy : ":0"); // move string logic into rxvt_display maybe?
277 336
337 int fd;
338#ifdef ENABLE_FRILLS
339 int n = get_listen_fds ();
340 if (n > 1)
341 {
342 fputs ("received multiple file descriptors, aborting.\n", stderr);
343 exit (EXIT_FAILURE);
344 }
345 else if (n == 1)
346 {
347 fd = SD_LISTEN_FDS_START;
348 if (!opt_quiet)
349 {
350 printf ("rxvt-unicode daemon listening on fd.\n");
351 fflush (stdout);
352 }
353 }
354 else
355#endif
356 {
278 char *sockname = rxvt_connection::unix_sockname (); 357 char *sockname = rxvt_connection::unix_sockname ();
358 fd = unix_listener::open (sockname);
359 if (!opt_quiet)
360 {
361 printf ("rxvt-unicode daemon listening on %s.\n", sockname);
362 fflush (stdout);
363 }
364 free (sockname);
365 }
366
279 unix_listener l (sockname); 367 unix_listener l (fd);
280 368
281 chdir ("/"); 369 chdir ("/");
282
283 if (!opt_quiet)
284 {
285 printf ("rxvt-unicode daemon listening on %s.\n", sockname);
286 fflush (stdout);
287 }
288
289 free (sockname);
290 370
291 pid_t pid = 0; 371 pid_t pid = 0;
292 if (opt_fork) 372 if (opt_fork)
293 { 373 {
294 pid = fork (); 374 pid = fork ();

Diff Legend

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