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.61 by root, Thu May 22 18:54:33 2014 UTC vs.
Revision 1.65 by sf-exg, Sat Jun 26 14:42:36 2021 UTC

… …
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);
87 fcntl (fd, F_SETFD, FD_CLOEXEC);
88 fcntl (fd, F_SETFL, O_NONBLOCK);
89 accept_ev.start (fd, ev::READ);
90}
84 91
92int unix_listener::open (const char *sockname)
93{
85 sockaddr_un sa; 94 sockaddr_un sa;
86 95
87 if (strlen (sockname) >= sizeof(sa.sun_path)) 96 if (strlen (sockname) >= sizeof(sa.sun_path))
88 { 97 {
89 fputs ("socket name too long, aborting.\n", stderr); 98 fputs ("socket name too long, aborting.\n", stderr);
90 exit (EXIT_FAILURE); 99 exit (EXIT_FAILURE);
91 } 100 }
92 101
102 int fd;
93 if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0) 103 if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
94 { 104 {
95 perror ("unable to create listening socket"); 105 perror ("unable to create listening socket");
96 exit (EXIT_FAILURE); 106 exit (EXIT_FAILURE);
97 } 107 }
98 108
99 fcntl (fd, F_SETFD, FD_CLOEXEC);
100 fcntl (fd, F_SETFL, O_NONBLOCK);
101
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);
106 113
… …
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);
… …
202 } 209 }
203 catch (const class rxvt_failure_exception &e) 210 catch (const class rxvt_failure_exception &e)
204 { 211 {
205 success = false; 212 success = false;
206 } 213 }
214 catch (const std::exception &e)
215 {
216 log_msg (e.what());
217 success = false;
218 }
207 219
208 term->log_hook = 0; 220 term->log_hook = 0;
209 221
210 chdir ("/"); // init might change to different working directory 222 chdir ("/"); // init might change to different working directory
211 223
… …
213 term->destroy (); 225 term->destroy ();
214 226
215 send ("END"); send (success ? 1 : 0); 227 send ("END"); send (success ? 1 : 0);
216 } 228 }
217 } 229 }
230 else if (!strcmp (tok, "QUIT"))
231 _exit (0);
218 else 232 else
219 return err ("protocol error: request '%s' unsupported.\n", (char *)tok); 233 return err ("protocol error: request '%s' unsupported.\n", (char *)tok);
220 } 234 }
221 else 235 else
222 return err (); 236 return err ();
223} 237}
224 238
239#ifdef ENABLE_FRILLS
240enum {
241 SD_LISTEN_FDS_START = 3,
242};
243
244// https://www.freedesktop.org/software/systemd/man/sd_listen_fds.html
245// https://github.com/systemd/systemd/blob/main/src/libsystemd/sd-daemon/sd-daemon.c
246static int get_listen_fds ()
247{
248 const char *listen_pid = getenv ("LISTEN_PID");
249 if (!listen_pid)
250 return 0;
251
252 char *end;
253 errno = 0;
254 long pid = strtol (listen_pid, &end, 10);
255 if (errno || end == listen_pid || *end)
256 return -1;
257
258 if (getpid () != pid)
259 return 0;
260
261 const char *listen_fds = getenv ("LISTEN_FDS");
262 if (!listen_fds)
263 return 0;
264
265 errno = 0;
266 long n = strtol (listen_fds, &end, 10);
267 if (errno || end == listen_fds || *end)
268 return -1;
269
270 if (n <= 0 || n > INT_MAX - SD_LISTEN_FDS_START)
271 return -1;
272
273 unsetenv ("LISTEN_PID");
274 unsetenv ("LISTEN_FDS");
275 unsetenv ("LISTEN_FDNAMES");
276
277 return n;
278}
279#endif
280
225int 281int
226main (int argc, char *argv[]) 282main (int argc, char *argv[])
227{ 283{
284 try
285 {
228 ptytty::init (); 286 ptytty::init ();
287 }
288 catch (const std::exception &e)
289 {
290 fputs (e.what (), stderr);
291 return EXIT_FAILURE;
292 }
229 293
230 static char opt_fork, opt_opendisplay, opt_quiet; 294 static char opt_fork, opt_opendisplay, opt_quiet;
231#if ENABLE_PERL 295#if ENABLE_PERL
232 static char *opt_eval; 296 static char *opt_eval;
233#endif 297#endif
… …
271 // optionally open display and never release it. 335 // optionally open display and never release it.
272 if (opt_opendisplay) 336 if (opt_opendisplay)
273 if (const char *dpy = getenv ("DISPLAY")) 337 if (const char *dpy = getenv ("DISPLAY"))
274 displays.get (dpy ? dpy : ":0"); // move string logic into rxvt_display maybe? 338 displays.get (dpy ? dpy : ":0"); // move string logic into rxvt_display maybe?
275 339
340 int fd;
341#ifdef ENABLE_FRILLS
342 int n = get_listen_fds ();
343 if (n > 1)
344 {
345 fputs ("received multiple file descriptors, aborting.\n", stderr);
346 exit (EXIT_FAILURE);
347 }
348 else if (n == 1)
349 {
350 fd = SD_LISTEN_FDS_START;
351 if (!opt_quiet)
352 {
353 printf ("rxvt-unicode daemon listening on fd.\n");
354 fflush (stdout);
355 }
356 }
357 else
358#endif
359 {
276 char *sockname = rxvt_connection::unix_sockname (); 360 char *sockname = rxvt_connection::unix_sockname ();
361 fd = unix_listener::open (sockname);
362 if (!opt_quiet)
363 {
364 printf ("rxvt-unicode daemon listening on %s.\n", sockname);
365 fflush (stdout);
366 }
367 free (sockname);
368 }
369
277 unix_listener l (sockname); 370 unix_listener l (fd);
278 371
279 chdir ("/"); 372 chdir ("/");
280
281 if (!opt_quiet)
282 {
283 printf ("rxvt-unicode daemon listening on %s.\n", sockname);
284 fflush (stdout);
285 }
286
287 free (sockname);
288 373
289 pid_t pid = 0; 374 pid_t pid = 0;
290 if (opt_fork) 375 if (opt_fork)
291 { 376 {
292 pid = fork (); 377 pid = fork ();

Diff Legend

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