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.5 by pcg, Thu Nov 27 10:12:10 2003 UTC vs.
Revision 1.29 by root, Mon Feb 20 22:42:00 2006 UTC

1#include "rxvtlib.h" 1/*----------------------------------------------------------------------*
2#include "rxvtdaemon.h" 2 * File: rxvtd.C
3#include "iom.h" 3 *----------------------------------------------------------------------*
4 *
5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
7 *
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
10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version.
12 *
13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details.
17 *
18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 *----------------------------------------------------------------------*/
4 22
23#include "../config.h"
5#include <cstdio> 24#include <cstdio>
6#include <cstdlib> 25#include <cstdlib>
7#include <cstdarg> 26#include <cstdarg>
8#include <cstring> 27#include <cstring>
9 28
10#include <unistd.h> 29#include <unistd.h>
30#include <fcntl.h>
11#include <sys/types.h> 31#include <sys/types.h>
12#include <sys/stat.h> 32#include <sys/stat.h>
13#include <sys/socket.h> 33#include <sys/socket.h>
14#include <sys/un.h> 34#include <sys/un.h>
15 35
16#include <cerrno> 36#include <cerrno>
17 37
18extern char **environ; 38#include "rxvt.h"
39#include "rxvtdaemon.h"
40#include "libptytty.h"
41#include "iom.h"
19 42
20struct server : rxvt_connection { 43struct server : rxvt_connection {
44 log_callback log_cb;
45 getfd_callback getfd_cb;
46
21 void read_cb (io_watcher &w, short revents); io_watcher read_ev; 47 void read_cb (io_watcher &w, short revents); io_watcher read_ev;
48 void log_msg (const char *msg);
49 int getfd (int remote_fd);
22 50
23 server (int fd) 51 server (int fd)
24 : read_ev (this, &server::read_cb) 52 : read_ev (this, &server::read_cb),
53 log_cb (this, &server::log_msg),
54 getfd_cb (this, &server::getfd)
25 { 55 {
26 this->fd = fd; 56 this->fd = fd;
27 read_ev.start (fd, EVENT_READ); 57 read_ev.start (fd, EVENT_READ);
28 } 58 }
29 59
… …
39}; 69};
40 70
41unix_listener::unix_listener (const char *sockname) 71unix_listener::unix_listener (const char *sockname)
42: accept_ev (this, &unix_listener::accept_cb) 72: accept_ev (this, &unix_listener::accept_cb)
43{ 73{
44 if ((fd = socket (PF_LOCAL, SOCK_STREAM, 0)) < 0) 74 if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
45 { 75 {
46 perror ("unable to create listening socket"); 76 perror ("unable to create listening socket");
47 exit (EXIT_FAILURE); 77 exit (EXIT_FAILURE);
48 } 78 }
49 79
80 fcntl (fd, F_SETFD, FD_CLOEXEC);
81
50 sockaddr_un sa; 82 sockaddr_un sa;
51 83
52 sa.sun_family = AF_UNIX; 84 sa.sun_family = AF_UNIX;
53 strcpy (sa.sun_path, sockname); 85 strcpy (sa.sun_path, sockname);
54 86
… …
76void unix_listener::accept_cb (io_watcher &w, short revents) 108void unix_listener::accept_cb (io_watcher &w, short revents)
77{ 109{
78 int fd2 = accept (fd, 0, 0); 110 int fd2 = accept (fd, 0, 0);
79 111
80 if (fd2 >= 0) 112 if (fd2 >= 0)
113 {
114 fcntl (fd2, F_SETFD, FD_CLOEXEC);
81 new server (fd2); 115 new server (fd2);
116 }
117}
118
119int server::getfd (int remote_fd)
120{
121 send ("GETFD");
122 send (remote_fd);
123 return ptytty::recv_fd (fd);
124}
125
126void server::log_msg (const char *msg)
127{
128 send ("MSG"), send (msg);
82} 129}
83 130
84void server::err (const char *format, ...) 131void server::err (const char *format, ...)
85{ 132{
86 if (format) 133 if (format)
… …
90 va_list ap; 137 va_list ap;
91 va_start (ap, format); 138 va_start (ap, format);
92 vsnprintf (err, 1024, format, ap); 139 vsnprintf (err, 1024, format, ap);
93 va_end (ap); 140 va_end (ap);
94 141
95 send ("ERR"), send (err); 142 send ("MSG"), send (err);
96 } 143 }
97 144
145 send ("END", 0);
98 close (fd); 146 close (fd);
99 delete this; 147 delete this;
100} 148}
101 149
102void server::read_cb (io_watcher &w, short revents) 150void server::read_cb (io_watcher &w, short revents)
… …
105 153
106 if (recv (tok)) 154 if (recv (tok))
107 { 155 {
108 if (!strcmp (tok, "NEW")) 156 if (!strcmp (tok, "NEW"))
109 { 157 {
110 stringvec argv; 158 stringvec *argv = new stringvec;
111 stringvec envv; 159 stringvec *envv = new stringvec;
112 160
113 for (;;) 161 for (;;)
114 { 162 {
115 if (!recv (tok)) 163 if (!recv (tok))
116 return err (); 164 return err ();
117 165
118 if (!strcmp (tok, "END")) 166 if (!strcmp (tok, "END"))
119 break; 167 break;
120 else if (!strcmp (tok, "ENV") && recv (tok)) 168 else if (!strcmp (tok, "ENV") && recv (tok))
121 envv.push_back (tok.get ()); 169 envv->push_back (strdup (tok));
122 else if (!strcmp (tok, "CWD") && recv (tok)) 170 else if (!strcmp (tok, "CWD") && recv (tok))
123 { 171 {
124 if (chdir (tok)) 172 if (chdir (tok))
125 err ("unable to change to working directory to '%s': %s", 173 err ("unable to change to working directory to '%s': %s",
126 (char *)tok, strerror (errno)); 174 (char *)tok, strerror (errno));
127 } 175 }
128 else if (!strcmp (tok, "ARG") && recv (tok)) 176 else if (!strcmp (tok, "ARG") && recv (tok))
129 argv.push_back (tok.get ()); 177 argv->push_back (strdup (tok));
130 else 178 else
131 return err ("protocol error: unexpected NEW token"); 179 return err ("protocol error: unexpected NEW token");
132 } 180 }
133 181
134 envv.push_back (0); 182 envv->push_back (0);
135 183
136 { 184 {
137 char **old_environ = environ; 185 rxvt_term *term = new rxvt_term;
138 environ = envv.begin (); 186
187 term->log_hook = &log_cb;
188 term->getfd_hook = &getfd_cb;
139 189
140 rxvt_init (argv.size (), argv.begin ()); 190 bool success;
191
192 try
193 {
194 success = term->init (argv, envv);
195 }
196 catch (const class rxvt_failure_exception &e)
197 {
198 success = false;
199 }
141 200
142 environ = old_environ; 201 term->log_hook = 0;
143 envv.clear (); // can't yet save the env 'cause rxvt modifies it :( 202
203 chdir ("/");
204
205 if (!success)
206 term->destroy ();
207
208 send ("END"); send (success ? 1 : 0);
144 } 209 }
145 } 210 }
146 else 211 else
147 return err ("protocol error: request '%s' unsupported.", (char *)tok); 212 return err ("protocol error: request '%s' unsupported.", (char *)tok);
148 } 213 }
149 else 214 else
150 return err (); 215 return err ();
151} 216}
152 217
218int opt_fork, opt_opendisplay, opt_quiet;
219
153int 220int
154main(int argc, const char *const *argv) 221main (int argc, const char *const *argv)
155{ 222{
223 rxvt_init ();
224
225 for (int i = 1; i < argc; i++)
226 {
227 if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork"))
228 opt_fork = 1;
229 else if (!strcmp (argv [i], "-o") || !strcmp (argv [i], "--opendisplay"))
230 opt_opendisplay = 1;
231 else if (!strcmp (argv [i], "-q") || !strcmp (argv [i], "--quiet"))
232 opt_quiet = 1;
233 else
234 {
235 rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]);
236 return EXIT_FAILURE;
237 }
238 }
156 { 239
157 sigset_t ss; 240 chdir ("/");
158 241
159 sigaddset (&ss, SIGHUP); 242 if (opt_opendisplay)
160 sigaddset (&ss, SIGPIPE); 243 displays.get (getenv ("DISPLAY")); // open display and never release it
161 sigprocmask (SIG_BLOCK, &ss, 0);
162 }
163
164 rxvt_init_signals ();
165 244
166 char *sockname = rxvt_connection::unix_sockname (); 245 char *sockname = rxvt_connection::unix_sockname ();
167 unix_listener l (sockname); 246 unix_listener l (sockname);
247
248 if (!opt_quiet)
249 {
168 printf ("rxvtd listening on %s.\n", sockname); 250 printf ("rxvt-unicode daemon listening on %s.\n", sockname);
251 fflush (stdout);
252 }
253
169 free (sockname); 254 free (sockname);
170 255
171 iom.loop (); 256 if (opt_fork)
257 {
258 pid_t pid = fork ();
172 259
173#if 0 260 if (pid < 0)
174 if (rxvt_init(argc, argv) == NULL) 261 {
262 rxvt_log ("unable to fork daemon, aborting.\n");
175 return EXIT_FAILURE; 263 return EXIT_FAILURE;
264 }
265 else if (pid > 0)
266 _exit (EXIT_SUCCESS);
267 }
176 268
177 dR; 269 io_manager::loop ();
178 rxvt_main_loop(aR); /* main processing loop */ 270
179#endif
180 return EXIT_SUCCESS; 271 return EXIT_SUCCESS;
181} 272}
273

Diff Legend

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