--- rxvt-unicode/src/rxvtd.C 2006/01/17 15:43:49 1.25 +++ rxvt-unicode/src/rxvtd.C 2021/06/26 14:42:36 1.65 @@ -1,13 +1,13 @@ -/*--------------------------------*-C-*---------------------------------* +/*----------------------------------------------------------------------* * File: rxvtd.C *----------------------------------------------------------------------* * * All portions of code are copyright by their respective author/s. - * Copyright (c) 2003-2004 Marc Lehmann + * Copyright (c) 2003-2007 Marc Lehmann * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -21,15 +21,10 @@ *----------------------------------------------------------------------*/ #include "../config.h" -#include "rxvt.h" -#include "rxvtdaemon.h" -#include "fdpass.h" -#include "iom.h" - -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -38,55 +33,83 @@ #include #include -#include +#if defined(ENABLE_FRILLS) && defined(_POSIX_MEMLOCK) && _POSIX_MEMLOCK > 0 +# define ENABLE_MLOCK 1 +#endif + +#if ENABLE_MLOCK +# include +#endif -extern char **environ; +#include -struct server : rxvt_connection { +#include "rxvt.h" +#include "rxvtdaemon.h" +#include "libptytty.h" + +struct server : rxvt_connection +{ log_callback log_cb; getfd_callback getfd_cb; - void read_cb (io_watcher &w, short revents); io_watcher read_ev; + void read_cb (ev::io &w, int revents); ev::io read_ev; void log_msg (const char *msg); int getfd (int remote_fd); server (int fd) - : read_ev (this, &server::read_cb), - log_cb (this, &server::log_msg), - getfd_cb (this, &server::getfd) { + read_ev.set (this); + log_cb.set (this); + getfd_cb.set (this); + this->fd = fd; - read_ev.start (fd, EVENT_READ); + fcntl (fd, F_SETFD, FD_CLOEXEC); + fcntl (fd, F_SETFL, 0); + read_ev.start (fd, ev::READ); } void err (const char *format = 0, ...); }; -struct unix_listener { +struct unix_listener +{ int fd; - void accept_cb (io_watcher &w, short revents); io_watcher accept_ev; + void accept_cb (ev::io &w, int revents); ev::io accept_ev; - unix_listener (const char *sockname); + unix_listener (int fd); + static int open (const char *sockname); }; -unix_listener::unix_listener (const char *sockname) -: accept_ev (this, &unix_listener::accept_cb) +unix_listener::unix_listener (int fd) : fd (fd) { + accept_ev.set (this); + fcntl (fd, F_SETFD, FD_CLOEXEC); + fcntl (fd, F_SETFL, O_NONBLOCK); + accept_ev.start (fd, ev::READ); +} + +int unix_listener::open (const char *sockname) +{ + sockaddr_un sa; + + if (strlen (sockname) >= sizeof(sa.sun_path)) + { + fputs ("socket name too long, aborting.\n", stderr); + exit (EXIT_FAILURE); + } + + int fd; if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0) { perror ("unable to create listening socket"); exit (EXIT_FAILURE); } - fcntl (fd, F_SETFD, FD_CLOEXEC); - - sockaddr_un sa; - sa.sun_family = AF_UNIX; strcpy (sa.sun_path, sockname); - unlink (rxvt_connection::unix_sockname ()); + unlink (sockname); mode_t omask = umask (0077); @@ -104,25 +127,22 @@ exit (EXIT_FAILURE); } - accept_ev.start (fd, EVENT_READ); + return fd; } -void unix_listener::accept_cb (io_watcher &w, short revents) +void unix_listener::accept_cb (ev::io &w, int revents) { int fd2 = accept (fd, 0, 0); if (fd2 >= 0) - { - fcntl (fd2, F_SETFD, FD_CLOEXEC); - new server (fd2); - } + new server (fd2); } int server::getfd (int remote_fd) { send ("GETFD"); send (remote_fd); - return rxvt_recv_fd (fd); + return ptytty::recv_fd (fd); } void server::log_msg (const char *msg) @@ -141,15 +161,15 @@ vsnprintf (err, 1024, format, ap); va_end (ap); - send ("MSG"), send (err); + log_msg (err); } - send ("END", 0); + send ("END"), send (0); close (fd); delete this; } -void server::read_cb (io_watcher &w, short revents) +void server::read_cb (ev::io &w, int revents) { auto_str tok; @@ -159,7 +179,7 @@ { stringvec *argv = new stringvec; stringvec *envv = new stringvec; - + for (;;) { if (!recv (tok)) @@ -168,43 +188,38 @@ if (!strcmp (tok, "END")) break; else if (!strcmp (tok, "ENV") && recv (tok)) - envv->push_back (tok.get ()); - else if (!strcmp (tok, "CWD") && recv (tok)) - { - if (chdir (tok)) - err ("unable to change to working directory to '%s': %s", - (char *)tok, strerror (errno)); - } + envv->push_back (strdup (tok)); else if (!strcmp (tok, "ARG") && recv (tok)) - argv->push_back (tok.get ()); + argv->push_back (strdup (tok)); else - return err ("protocol error: unexpected NEW token"); + return err ("protocol error: unexpected NEW token.\n"); } - envv->push_back (0); - { rxvt_term *term = new rxvt_term; - + term->log_hook = &log_cb; term->getfd_hook = &getfd_cb; - term->argv = argv; - term->envv = envv; - bool success; - + bool success = true; + try { - success = term->init (argv->size (), argv->begin ()); + term->init (argv, envv); } catch (const class rxvt_failure_exception &e) { success = false; } + catch (const std::exception &e) + { + log_msg (e.what()); + success = false; + } term->log_hook = 0; - chdir ("/"); + chdir ("/"); // init might change to different working directory if (!success) term->destroy (); @@ -212,19 +227,77 @@ send ("END"); send (success ? 1 : 0); } } + else if (!strcmp (tok, "QUIT")) + _exit (0); else - return err ("protocol error: request '%s' unsupported.", (char *)tok); + return err ("protocol error: request '%s' unsupported.\n", (char *)tok); } else return err (); } -int opt_fork, opt_opendisplay, opt_quiet; +#ifdef ENABLE_FRILLS +enum { + SD_LISTEN_FDS_START = 3, +}; + +// https://www.freedesktop.org/software/systemd/man/sd_listen_fds.html +// https://github.com/systemd/systemd/blob/main/src/libsystemd/sd-daemon/sd-daemon.c +static int get_listen_fds () +{ + const char *listen_pid = getenv ("LISTEN_PID"); + if (!listen_pid) + return 0; + + char *end; + errno = 0; + long pid = strtol (listen_pid, &end, 10); + if (errno || end == listen_pid || *end) + return -1; + + if (getpid () != pid) + return 0; + + const char *listen_fds = getenv ("LISTEN_FDS"); + if (!listen_fds) + return 0; + + errno = 0; + long n = strtol (listen_fds, &end, 10); + if (errno || end == listen_fds || *end) + return -1; + + if (n <= 0 || n > INT_MAX - SD_LISTEN_FDS_START) + return -1; + + unsetenv ("LISTEN_PID"); + unsetenv ("LISTEN_FDS"); + unsetenv ("LISTEN_FDNAMES"); + + return n; +} +#endif int -main (int argc, const char *const *argv) +main (int argc, char *argv[]) { - rxvt_init (); + try + { + ptytty::init (); + } + catch (const std::exception &e) + { + fputs (e.what (), stderr); + return EXIT_FAILURE; + } + + static char opt_fork, opt_opendisplay, opt_quiet; +#if ENABLE_PERL + static char *opt_eval; +#endif +#if ENABLE_MLOCK + static char opt_lock; +#endif for (int i = 1; i < argc; i++) { @@ -234,33 +307,85 @@ opt_opendisplay = 1; else if (!strcmp (argv [i], "-q") || !strcmp (argv [i], "--quiet")) opt_quiet = 1; +#if ENABLE_MLOCK + else if (!strcmp (argv [i], "-m") || !strcmp (argv [i], "--mlock")) + opt_lock = 1; +#endif +#if ENABLE_PERL + else if (!strcmp (argv [i], "-e") || !strcmp (argv [i], "--eval")) + opt_eval = argv [++i]; +#endif else { rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]); return EXIT_FAILURE; } } - - chdir ("/"); - if (opt_opendisplay) - displays.get (getenv ("DISPLAY")); // open display and never release it + rxvt_init (); + +#if ENABLE_PERL + if (opt_eval) + { + rxvt_perl.init (); + rxvt_perl.eval (opt_eval); + } +#endif - char *sockname = rxvt_connection::unix_sockname (); - unix_listener l (sockname); + // optionally open display and never release it. + if (opt_opendisplay) + if (const char *dpy = getenv ("DISPLAY")) + displays.get (dpy ? dpy : ":0"); // move string logic into rxvt_display maybe? - if (!opt_quiet) + int fd; +#ifdef ENABLE_FRILLS + int n = get_listen_fds (); + if (n > 1) { - printf ("rxvt-unicode daemon listening on %s.\n", sockname); - fflush (stdout); + fputs ("received multiple file descriptors, aborting.\n", stderr); + exit (EXIT_FAILURE); + } + else if (n == 1) + { + fd = SD_LISTEN_FDS_START; + if (!opt_quiet) + { + printf ("rxvt-unicode daemon listening on fd.\n"); + fflush (stdout); + } } + else +#endif + { + char *sockname = rxvt_connection::unix_sockname (); + fd = unix_listener::open (sockname); + if (!opt_quiet) + { + printf ("rxvt-unicode daemon listening on %s.\n", sockname); + fflush (stdout); + } + free (sockname); + } + + unix_listener l (fd); - free (sockname); + chdir ("/"); + pid_t pid = 0; if (opt_fork) { - pid_t pid = fork (); + pid = fork (); + } +#if ENABLE_MLOCK + // Optionally perform an mlockall so this process does not get swapped out. + if (opt_lock && !pid) + if (mlockall (MCL_CURRENT | MCL_FUTURE) < 0) + perror ("unable to lock into ram"); +#endif + + if (opt_fork) + { if (pid < 0) { rxvt_log ("unable to fork daemon, aborting.\n"); @@ -268,9 +393,11 @@ } else if (pid > 0) _exit (EXIT_SUCCESS); + + ev_loop_fork (EV_DEFAULT_UC); } - io_manager::loop (); + ev_run (); return EXIT_SUCCESS; }