--- rxvt-unicode/src/rxvtd.C 2005/12/23 14:46:35 1.22 +++ rxvt-unicode/src/rxvtd.C 2010/11/19 00:10:18 1.53 @@ -1,9 +1,9 @@ -/*--------------------------------*-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 @@ -21,11 +21,6 @@ *----------------------------------------------------------------------*/ #include "../config.h" -#include "rxvt.h" -#include "rxvtdaemon.h" -#include "fdpass.h" -#include "iom.h" - #include #include #include @@ -38,25 +33,38 @@ #include #include +#if defined(ENABLE_FRILLS) && defined(_POSIX_MEMLOCK) && _POSIX_MEMLOCK > 0 +# define ENABLE_MLOCK 1 +#endif + +#if ENABLE_MLOCK +# include +#endif + #include -extern char **environ; +#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, ...); @@ -65,23 +73,31 @@ 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::unix_listener (const char *sockname) -: accept_ev (this, &unix_listener::accept_cb) { - if ((fd = socket (PF_UNIX, SOCK_STREAM, 0)) < 0) + accept_ev.set (this); + + sockaddr_un sa; + + if (strlen (sockname) >= sizeof(sa.sun_path)) + { + fputs ("socket name too long, aborting.\n", stderr); + exit (EXIT_FAILURE); + } + + 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; + fcntl (fd, F_SETFL, O_NONBLOCK); sa.sun_family = AF_UNIX; strcpy (sa.sun_path, sockname); @@ -104,29 +120,22 @@ exit (EXIT_FAILURE); } - accept_ev.start (fd, EVENT_READ); + accept_ev.start (fd, ev::READ); } -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) { -#if ENABLE_FRILLS && HAVE_UNIX_FDPASS send ("GETFD"); send (remote_fd); - return rxvt_recv_fd (fd); -#else - return -1; -#endif + return ptytty::recv_fd (fd); } void server::log_msg (const char *msg) @@ -145,15 +154,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; @@ -163,7 +172,7 @@ { stringvec *argv = new stringvec; stringvec *envv = new stringvec; - + for (;;) { if (!recv (tok)) @@ -172,37 +181,26 @@ 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); { - char **old_environ = environ; - environ = envv->begin (); - 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) { @@ -211,8 +209,7 @@ term->log_hook = 0; - environ = old_environ; - chdir ("/"); + chdir ("/"); // init might change to different working directory if (!success) term->destroy (); @@ -221,17 +218,22 @@ } } 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; - int main (int argc, const char *const *argv) { + ptytty::init (); + + int opt_fork = 0, opt_opendisplay = 0, opt_quiet = 0; +#if ENABLE_MLOCK + int opt_lock = 0; +#endif + for (int i = 1; i < argc; i++) { if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork")) @@ -240,23 +242,29 @@ 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 else { rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]); return EXIT_FAILURE; } } - - rxvt_init (); - chdir ("/"); + rxvt_init (); + // optionally open display and never release it. if (opt_opendisplay) - displays.get (getenv ("DISPLAY")); // open display and never release it + if (const char *dpy = getenv ("DISPLAY")) + displays.get (dpy ? dpy : ":0"); // move string logic into rxvt_display maybe? char *sockname = rxvt_connection::unix_sockname (); unix_listener l (sockname); + chdir ("/"); + if (!opt_quiet) { printf ("rxvt-unicode daemon listening on %s.\n", sockname); @@ -265,10 +273,21 @@ free (sockname); + 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"); @@ -276,9 +295,11 @@ } else if (pid > 0) _exit (EXIT_SUCCESS); + + ev_loop_fork (EV_DEFAULT_UC); } - io_manager::loop (); + ev_run (); return EXIT_SUCCESS; }