--- rxvt-unicode/src/rxvtd.C 2004/02/13 12:16:21 1.8 +++ rxvt-unicode/src/rxvtd.C 2007/12/04 16:24:00 1.41 @@ -1,13 +1,33 @@ -#include "rxvtlib.h" -#include "rxvtdaemon.h" -#include "iom.h" +/*----------------------------------------------------------------------* + * File: rxvtd.C + *----------------------------------------------------------------------* + * + * All portions of code are copyright by their respective author/s. + * Copyright (c) 2003-2006 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 + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + *----------------------------------------------------------------------*/ +#include "../config.h" #include #include #include #include #include +#include #include #include #include @@ -15,16 +35,28 @@ #include -extern char **environ; +#include "rxvt.h" +#include "rxvtdaemon.h" +#include "libptytty.h" struct server : rxvt_connection { - void read_cb (io_watcher &w, short revents); io_watcher read_ev; + log_callback log_cb; + getfd_callback getfd_cb; + + 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) { + 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, ...); @@ -33,21 +65,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_LOCAL, 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); } - sockaddr_un sa; + fcntl (fd, F_SETFD, FD_CLOEXEC); + fcntl (fd, F_SETFL, O_NONBLOCK); sa.sun_family = AF_UNIX; strcpy (sa.sun_path, sockname); @@ -70,10 +112,10 @@ 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); @@ -81,6 +123,18 @@ new server (fd2); } +int server::getfd (int remote_fd) +{ + send ("GETFD"); + send (remote_fd); + return ptytty::recv_fd (fd); +} + +void server::log_msg (const char *msg) +{ + send ("MSG"), send (msg); +} + void server::err (const char *format, ...) { if (format) @@ -92,14 +146,15 @@ vsnprintf (err, 1024, format, ap); va_end (ap); - send ("ERR"), send (err); + log_msg (err); } + 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; @@ -107,9 +162,9 @@ { if (!strcmp (tok, "NEW")) { - stringvec argv; - stringvec envv; - + stringvec *argv = new stringvec; + stringvec *envv = new stringvec; + for (;;) { if (!recv (tok)) @@ -118,57 +173,114 @@ if (!strcmp (tok, "END")) break; else if (!strcmp (tok, "ENV") && recv (tok)) - envv.push_back (tok.get ()); + envv->push_back (strdup (tok)); else if (!strcmp (tok, "CWD") && recv (tok)) { if (chdir (tok)) - err ("unable to change to working directory to '%s': %s", - (char *)tok, strerror (errno)); + { + delete envv; + delete argv; + return err ("unable to change to working directory to '%s', aborting: %s.\n", + (char *)tok, strerror (errno)); + } } 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); + 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; + + bool success; + + try + { + success = term->init (argv, envv); + } + catch (const class rxvt_failure_exception &e) + { + success = false; + } - rxvt_init (argv.size (), argv.begin ()); + term->log_hook = 0; - environ = old_environ; - envv.clear (); // can't yet save the env 'cause rxvt modifies it : ( + chdir ("/"); + + if (!success) + term->destroy (); + + send ("END"); send (success ? 1 : 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; + int main (int argc, const char *const *argv) { - rxvt_init_signals (); + rxvt_init (); + + for (int i = 1; i < argc; i++) + { + if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork")) + opt_fork = 1; + else if (!strcmp (argv [i], "-o") || !strcmp (argv [i], "--opendisplay")) + opt_opendisplay = 1; + else if (!strcmp (argv [i], "-q") || !strcmp (argv [i], "--quiet")) + opt_quiet = 1; + 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 char *sockname = rxvt_connection::unix_sockname (); unix_listener l (sockname); - printf ("rxvtd listening on %s.\n", sockname); + + if (!opt_quiet) + { + printf ("rxvt-unicode daemon listening on %s.\n", sockname); + fflush (stdout); + } + free (sockname); - iom.loop (); + if (opt_fork) + { + pid_t pid = fork (); + + if (pid < 0) + { + rxvt_log ("unable to fork daemon, aborting.\n"); + return EXIT_FAILURE; + } + else if (pid > 0) + _exit (EXIT_SUCCESS); + + ev_default_fork (); + } + + ev_loop (0); -#if 0 - if (rxvt_init (argc, argv) == NULL) - return EXIT_FAILURE; - - dR; - rxvt_main_loop (aR); /* main processing loop */ -#endif return EXIT_SUCCESS; }