--- rxvt-unicode/src/rxvtd.C 2003/11/25 11:52:42 1.3 +++ rxvt-unicode/src/rxvtd.C 2006/02/20 22:42:00 1.29 @@ -1,25 +1,57 @@ -#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 #include #include -extern char **environ; +#include "rxvt.h" +#include "rxvtdaemon.h" +#include "libptytty.h" +#include "iom.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 log_msg (const char *msg); + int getfd (int remote_fd); server (int fd) - : read_ev (this, &server::read_cb) + : read_ev (this, &server::read_cb), + log_cb (this, &server::log_msg), + getfd_cb (this, &server::getfd) { this->fd = fd; read_ev.start (fd, EVENT_READ); @@ -28,36 +60,42 @@ void err (const char *format = 0, ...); }; -struct listener { +struct unix_listener { int fd; void accept_cb (io_watcher &w, short revents); io_watcher accept_ev; - listener (); + unix_listener (const char *sockname); }; -listener::listener () -: accept_ev (this, &listener::accept_cb) +unix_listener::unix_listener (const char *sockname) +: accept_ev (this, &unix_listener::accept_cb) { - if ((fd = socket (PF_LOCAL, SOCK_STREAM, 0)) < 0) + 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, rxvt_connection::unix_sockname ()); + strcpy (sa.sun_path, sockname); unlink (rxvt_connection::unix_sockname ()); + mode_t omask = umask (0077); + if (bind (fd, (sockaddr *)&sa, sizeof (sa))) { perror ("unable to bind listening socket"); exit (EXIT_FAILURE); } + umask (omask); + if (listen (fd, 5)) { perror ("unable to listen on socket"); @@ -67,12 +105,27 @@ accept_ev.start (fd, EVENT_READ); } -void listener::accept_cb (io_watcher &w, short revents) +void unix_listener::accept_cb (io_watcher &w, short revents) { int fd2 = accept (fd, 0, 0); if (fd2 >= 0) - new server (fd2); + { + fcntl (fd2, F_SETFD, FD_CLOEXEC); + 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, ...) @@ -86,9 +139,10 @@ vsnprintf (err, 1024, format, ap); va_end (ap); - send ("ERR"), send (err); + send ("MSG"), send (err); } + send ("END", 0); close (fd); delete this; } @@ -101,8 +155,8 @@ { if (!strcmp (tok, "NEW")) { - stringvec argv; - stringvec envv; + stringvec *argv = new stringvec; + stringvec *envv = new stringvec; for (;;) { @@ -112,7 +166,7 @@ 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)) @@ -120,22 +174,38 @@ (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"); } - 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; + } + + term->log_hook = 0; + + chdir ("/"); - rxvt_init (argv.size (), argv.begin ()); - //dR; - //rxvt_main_loop (aR); + if (!success) + term->destroy (); - environ = old_environ; + send ("END"); send (success ? 1 : 0); } } else @@ -145,27 +215,59 @@ return err (); } +int opt_fork, opt_opendisplay, opt_quiet; + int -main(int argc, const char *const *argv) +main (int argc, const char *const *argv) { - listener l; + rxvt_init (); - { - sigset_t ss; + 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 ("/"); - sigaddset (&ss, SIGHUP); - sigprocmask (SIG_BLOCK, &ss, 0); - } + if (opt_opendisplay) + displays.get (getenv ("DISPLAY")); // open display and never release it + + char *sockname = rxvt_connection::unix_sockname (); + unix_listener l (sockname); + + if (!opt_quiet) + { + printf ("rxvt-unicode daemon listening on %s.\n", sockname); + fflush (stdout); + } + + free (sockname); + + if (opt_fork) + { + pid_t pid = fork (); - printf ("rxvtd running.\n"); - iom.loop (); + if (pid < 0) + { + rxvt_log ("unable to fork daemon, aborting.\n"); + return EXIT_FAILURE; + } + else if (pid > 0) + _exit (EXIT_SUCCESS); + } + + io_manager::loop (); -#if 0 - if (rxvt_init(argc, argv) == NULL) - return EXIT_FAILURE; - - dR; - rxvt_main_loop(aR); /* main processing loop */ -#endif return EXIT_SUCCESS; } +