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.66 by sf-exg, Sat Jun 26 14:44:30 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);
… …
198 205
199 try 206 try
200 { 207 {
201 term->init (argv, envv); 208 term->init (argv, envv);
202 } 209 }
203 catch (const class rxvt_failure_exception &e) 210 catch (const std::exception &e)
204 { 211 {
212 log_msg (e.what());
205 success = false; 213 success = false;
206 } 214 }
207 215
208 term->log_hook = 0; 216 term->log_hook = 0;
209 217
… …
213 term->destroy (); 221 term->destroy ();
214 222
215 send ("END"); send (success ? 1 : 0); 223 send ("END"); send (success ? 1 : 0);
216 } 224 }
217 } 225 }
226 else if (!strcmp (tok, "QUIT"))
227 _exit (0);
218 else 228 else
219 return err ("protocol error: request '%s' unsupported.\n", (char *)tok); 229 return err ("protocol error: request '%s' unsupported.\n", (char *)tok);
220 } 230 }
221 else 231 else
222 return err (); 232 return err ();
223} 233}
224 234
235#ifdef ENABLE_FRILLS
236enum {
237 SD_LISTEN_FDS_START = 3,
238};
239
240// https://www.freedesktop.org/software/systemd/man/sd_listen_fds.html
241// https://github.com/systemd/systemd/blob/main/src/libsystemd/sd-daemon/sd-daemon.c
242static int get_listen_fds ()
243{
244 const char *listen_pid = getenv ("LISTEN_PID");
245 if (!listen_pid)
246 return 0;
247
248 char *end;
249 errno = 0;
250 long pid = strtol (listen_pid, &end, 10);
251 if (errno || end == listen_pid || *end)
252 return -1;
253
254 if (getpid () != pid)
255 return 0;
256
257 const char *listen_fds = getenv ("LISTEN_FDS");
258 if (!listen_fds)
259 return 0;
260
261 errno = 0;
262 long n = strtol (listen_fds, &end, 10);
263 if (errno || end == listen_fds || *end)
264 return -1;
265
266 if (n <= 0 || n > INT_MAX - SD_LISTEN_FDS_START)
267 return -1;
268
269 unsetenv ("LISTEN_PID");
270 unsetenv ("LISTEN_FDS");
271 unsetenv ("LISTEN_FDNAMES");
272
273 return n;
274}
275#endif
276
225int 277int
226main (int argc, char *argv[]) 278main (int argc, char *argv[])
227{ 279{
280 try
281 {
228 ptytty::init (); 282 ptytty::init ();
283 }
284 catch (const std::exception &e)
285 {
286 fputs (e.what (), stderr);
287 return EXIT_FAILURE;
288 }
229 289
230 static char opt_fork, opt_opendisplay, opt_quiet; 290 static char opt_fork, opt_opendisplay, opt_quiet;
231#if ENABLE_PERL 291#if ENABLE_PERL
232 static char *opt_eval; 292 static char *opt_eval;
233#endif 293#endif
… …
271 // optionally open display and never release it. 331 // optionally open display and never release it.
272 if (opt_opendisplay) 332 if (opt_opendisplay)
273 if (const char *dpy = getenv ("DISPLAY")) 333 if (const char *dpy = getenv ("DISPLAY"))
274 displays.get (dpy ? dpy : ":0"); // move string logic into rxvt_display maybe? 334 displays.get (dpy ? dpy : ":0"); // move string logic into rxvt_display maybe?
275 335
336 int fd;
337#ifdef ENABLE_FRILLS
338 int n = get_listen_fds ();
339 if (n > 1)
340 {
341 fputs ("received multiple file descriptors, aborting.\n", stderr);
342 exit (EXIT_FAILURE);
343 }
344 else if (n == 1)
345 {
346 fd = SD_LISTEN_FDS_START;
347 if (!opt_quiet)
348 {
349 printf ("rxvt-unicode daemon listening on fd.\n");
350 fflush (stdout);
351 }
352 }
353 else
354#endif
355 {
276 char *sockname = rxvt_connection::unix_sockname (); 356 char *sockname = rxvt_connection::unix_sockname ();
357 fd = unix_listener::open (sockname);
358 if (!opt_quiet)
359 {
360 printf ("rxvt-unicode daemon listening on %s.\n", sockname);
361 fflush (stdout);
362 }
363 free (sockname);
364 }
365
277 unix_listener l (sockname); 366 unix_listener l (fd);
278 367
279 chdir ("/"); 368 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 369
289 pid_t pid = 0; 370 pid_t pid = 0;
290 if (opt_fork) 371 if (opt_fork)
291 { 372 {
292 pid = fork (); 373 pid = fork ();

Diff Legend

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