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.63 by sf-exg, Sun May 9 05:53:12 2021 UTC

… …
73struct unix_listener { 73struct unix_listener {
74 int fd; 74 int fd;
75 75
76 void accept_cb (ev::io &w, int revents); ev::io accept_ev; 76 void accept_cb (ev::io &w, int revents); ev::io accept_ev;
77 77
78 unix_listener (int fd);
78 unix_listener (const char *sockname); 79 static int open (const char *sockname);
79}; 80};
80 81
81unix_listener::unix_listener (const char *sockname) 82unix_listener::unix_listener (int fd) : fd (fd)
82{ 83{
83 accept_ev.set<unix_listener, &unix_listener::accept_cb> (this); 84 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); 85 fcntl (fd, F_SETFD, FD_CLOEXEC);
100 fcntl (fd, F_SETFL, O_NONBLOCK); 86 fcntl (fd, F_SETFL, O_NONBLOCK);
87 accept_ev.start (fd, ev::READ);
88}
89
90int unix_listener::open (const char *sockname)
91{
92 sockaddr_un sa;
93
94 if (strlen (sockname) >= sizeof(sa.sun_path))
95 {
96 fputs ("socket name too long, aborting.\n", stderr);
97 exit (EXIT_FAILURE);
98 }
99
100 int fd;
101 if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
102 {
103 perror ("unable to create listening socket");
104 exit (EXIT_FAILURE);
105 }
101 106
102 sa.sun_family = AF_UNIX; 107 sa.sun_family = AF_UNIX;
103 strcpy (sa.sun_path, sockname); 108 strcpy (sa.sun_path, sockname);
104 109
105 unlink (sockname); 110 unlink (sockname);
… …
118 { 123 {
119 perror ("unable to listen on socket"); 124 perror ("unable to listen on socket");
120 exit (EXIT_FAILURE); 125 exit (EXIT_FAILURE);
121 } 126 }
122 127
123 accept_ev.start (fd, ev::READ); 128 return fd;
124} 129}
125 130
126void unix_listener::accept_cb (ev::io &w, int revents) 131void unix_listener::accept_cb (ev::io &w, int revents)
127{ 132{
128 int fd2 = accept (fd, 0, 0); 133 int fd2 = accept (fd, 0, 0);
… …
222 } 227 }
223 else 228 else
224 return err (); 229 return err ();
225} 230}
226 231
232#ifdef ENABLE_FRILLS
233enum {
234 SD_LISTEN_FDS_START = 3,
235};
236
237// https://www.freedesktop.org/software/systemd/man/sd_listen_fds.html
238// https://github.com/systemd/systemd/blob/main/src/libsystemd/sd-daemon/sd-daemon.c
239static int get_listen_fds ()
240{
241 const char *listen_pid = getenv ("LISTEN_PID");
242 if (!listen_pid)
243 return 0;
244
245 char *end;
246 errno = 0;
247 long pid = strtol (listen_pid, &end, 10);
248 if (errno || end == listen_pid || *end)
249 return -1;
250
251 if (getpid () != pid)
252 return 0;
253
254 const char *listen_fds = getenv ("LISTEN_FDS");
255 if (!listen_fds)
256 return 0;
257
258 errno = 0;
259 long n = strtol (listen_fds, &end, 10);
260 if (errno || end == listen_fds || *end)
261 return -1;
262
263 if (n <= 0 || n > INT_MAX - SD_LISTEN_FDS_START)
264 return -1;
265
266 unsetenv ("LISTEN_PID");
267 unsetenv ("LISTEN_FDS");
268 unsetenv ("LISTEN_FDNAMES");
269
270 return n;
271}
272#endif
273
227int 274int
228main (int argc, char *argv[]) 275main (int argc, char *argv[])
229{ 276{
230 ptytty::init (); 277 ptytty::init ();
231 278
… …
273 // optionally open display and never release it. 320 // optionally open display and never release it.
274 if (opt_opendisplay) 321 if (opt_opendisplay)
275 if (const char *dpy = getenv ("DISPLAY")) 322 if (const char *dpy = getenv ("DISPLAY"))
276 displays.get (dpy ? dpy : ":0"); // move string logic into rxvt_display maybe? 323 displays.get (dpy ? dpy : ":0"); // move string logic into rxvt_display maybe?
277 324
325 int fd;
326#ifdef ENABLE_FRILLS
327 int n = get_listen_fds ();
328 if (n > 1)
329 {
330 fputs ("received multiple file descriptors, aborting.\n", stderr);
331 exit (EXIT_FAILURE);
332 }
333 else if (n == 1)
334 {
335 fd = SD_LISTEN_FDS_START;
336 if (!opt_quiet)
337 {
338 printf ("rxvt-unicode daemon listening on fd.\n");
339 fflush (stdout);
340 }
341 }
342 else
343#endif
344 {
278 char *sockname = rxvt_connection::unix_sockname (); 345 char *sockname = rxvt_connection::unix_sockname ();
346 fd = unix_listener::open (sockname);
347 if (!opt_quiet)
348 {
349 printf ("rxvt-unicode daemon listening on %s.\n", sockname);
350 fflush (stdout);
351 }
352 free (sockname);
353 }
354
279 unix_listener l (sockname); 355 unix_listener l (fd);
280 356
281 chdir ("/"); 357 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 358
291 pid_t pid = 0; 359 pid_t pid = 0;
292 if (opt_fork) 360 if (opt_fork)
293 { 361 {
294 pid = fork (); 362 pid = fork ();

Diff Legend

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