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.48 by root, Fri May 8 23:52:55 2009 UTC vs.
Revision 1.67 by sf-exg, Fri Jul 23 19:18:52 2021 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtd.C 2 * File: rxvtd.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
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 <pcg@goof.com> 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
… …
19 * along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 *----------------------------------------------------------------------*/ 21 *----------------------------------------------------------------------*/
22 22
23#include "../config.h" 23#include "../config.h"
24#include <cstdio> 24#include <stdio.h>
25#include <cstdlib> 25#include <stdlib.h>
26#include <cstdarg> 26#include <stdarg.h>
27#include <cstring> 27#include <string.h>
28 28
29#include <unistd.h> 29#include <unistd.h>
30#include <fcntl.h> 30#include <fcntl.h>
31#include <sys/types.h> 31#include <sys/types.h>
32#include <sys/stat.h> 32#include <sys/stat.h>
… …
39 39
40#if ENABLE_MLOCK 40#if ENABLE_MLOCK
41# include <sys/mman.h> 41# include <sys/mman.h>
42#endif 42#endif
43 43
44#include <cerrno> 44#include <errno.h>
45
46#include <libptytty.h>
45 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 (rxvt_connection::unix_sockname ()); 113 unlink (sockname);
106 114
107 mode_t omask = umask (0077); 115 mode_t omask = umask (0077);
108 116
109 if (bind (fd, (sockaddr *)&sa, sizeof (sa))) 117 if (bind (fd, (sockaddr *)&sa, sizeof (sa)))
110 { 118 {
… …
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);
… …
186 argv->push_back (strdup (tok)); 194 argv->push_back (strdup (tok));
187 else 195 else
188 return err ("protocol error: unexpected NEW token.\n"); 196 return err ("protocol error: unexpected NEW token.\n");
189 } 197 }
190 198
191 envv->push_back (0);
192
193 { 199 {
194 rxvt_term *term = new rxvt_term; 200 rxvt_term *term = new rxvt_term;
195 201
196 term->log_hook = &log_cb; 202 term->log_hook = &log_cb;
197 term->getfd_hook = &getfd_cb; 203 term->getfd_hook = &getfd_cb;
… …
200 206
201 try 207 try
202 { 208 {
203 term->init (argv, envv); 209 term->init (argv, envv);
204 } 210 }
205 catch (const class rxvt_failure_exception &e) 211 catch (const std::exception &e)
206 { 212 {
213 log_msg (e.what());
207 success = false; 214 success = false;
208 } 215 }
209 216
210 term->log_hook = 0; 217 term->log_hook = 0;
211 218
… …
215 term->destroy (); 222 term->destroy ();
216 223
217 send ("END"); send (success ? 1 : 0); 224 send ("END"); send (success ? 1 : 0);
218 } 225 }
219 } 226 }
227 else if (!strcmp (tok, "QUIT"))
228 _exit (0);
220 else 229 else
221 return err ("protocol error: request '%s' unsupported.\n", (char *)tok); 230 return err ("protocol error: request '%s' unsupported.\n", (char *)tok);
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
278int
279main (int argc, char *argv[])
280{
281 try
282 {
283 ptytty::init ();
284 }
285 catch (const std::exception &e)
286 {
287 fputs (e.what (), stderr);
288 return EXIT_FAILURE;
289 }
290
227int opt_fork, opt_opendisplay, opt_quiet; 291 static char opt_fork, opt_opendisplay, opt_quiet;
292#if ENABLE_PERL
293 static char *opt_eval;
294#endif
228#if ENABLE_MLOCK 295#if ENABLE_MLOCK
229int opt_lock; 296 static char opt_lock;
230#endif 297#endif
231
232int
233main (int argc, const char *const *argv)
234{
235 rxvt_init ();
236 298
237 for (int i = 1; i < argc; i++) 299 for (int i = 1; i < argc; i++)
238 { 300 {
239 if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork")) 301 if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork"))
240 opt_fork = 1; 302 opt_fork = 1;
… …
244 opt_quiet = 1; 306 opt_quiet = 1;
245#if ENABLE_MLOCK 307#if ENABLE_MLOCK
246 else if (!strcmp (argv [i], "-m") || !strcmp (argv [i], "--mlock")) 308 else if (!strcmp (argv [i], "-m") || !strcmp (argv [i], "--mlock"))
247 opt_lock = 1; 309 opt_lock = 1;
248#endif 310#endif
311#if ENABLE_PERL
312 else if (!strcmp (argv [i], "-e") || !strcmp (argv [i], "--eval"))
313 opt_eval = argv [++i];
314#endif
249 else 315 else
250 { 316 {
251 rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]); 317 rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]);
252 return EXIT_FAILURE; 318 return EXIT_FAILURE;
253 } 319 }
254 } 320 }
255 321
322 rxvt_init ();
323
324#if ENABLE_PERL
325 if (opt_eval)
326 {
327 rxvt_perl.init ();
328 rxvt_perl.eval (opt_eval);
329 }
330#endif
331
256 // optionally open display and never release it. 332 // optionally open display and never release it.
257 if (opt_opendisplay) 333 if (opt_opendisplay)
258 if (const char *dpy = getenv ("DISPLAY")) 334 if (const char *dpy = getenv ("DISPLAY"))
259 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?
260 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 {
261 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
262 unix_listener l (sockname); 367 unix_listener l (fd);
263 368
264 chdir ("/"); 369 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 370
274 pid_t pid = 0; 371 pid_t pid = 0;
275 if (opt_fork) 372 if (opt_fork)
276 { 373 {
277 pid = fork (); 374 pid = fork ();
… …
292 return EXIT_FAILURE; 389 return EXIT_FAILURE;
293 } 390 }
294 else if (pid > 0) 391 else if (pid > 0)
295 _exit (EXIT_SUCCESS); 392 _exit (EXIT_SUCCESS);
296 393
297 ev_default_fork (); 394 ev_loop_fork (EV_DEFAULT_UC);
298 } 395 }
299 396
300 ev_loop (0); 397 ev_run ();
301 398
302 return EXIT_SUCCESS; 399 return EXIT_SUCCESS;
303} 400}
304 401

Diff Legend

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