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.9 by pcg, Fri Feb 13 13:28:17 2004 UTC vs.
Revision 1.48 by root, Fri May 8 23:52:55 2009 UTC

1/*----------------------------------------------------------------------*
2 * File: rxvtd.C
3 *----------------------------------------------------------------------*
4 *
5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2003-2007 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 *----------------------------------------------------------------------*/
22
1#include "../config.h" 23#include "../config.h"
2#include "rxvt.h"
3#include "rxvtdaemon.h"
4#include "iom.h"
5
6#include <cstdio> 24#include <cstdio>
7#include <cstdlib> 25#include <cstdlib>
8#include <cstdarg> 26#include <cstdarg>
9#include <cstring> 27#include <cstring>
10 28
11#include <unistd.h> 29#include <unistd.h>
30#include <fcntl.h>
12#include <sys/types.h> 31#include <sys/types.h>
13#include <sys/stat.h> 32#include <sys/stat.h>
14#include <sys/socket.h> 33#include <sys/socket.h>
15#include <sys/un.h> 34#include <sys/un.h>
16 35
36#if defined(ENABLE_FRILLS) && defined(_POSIX_MEMLOCK) && _POSIX_MEMLOCK > 0
37# define ENABLE_MLOCK 1
38#endif
39
40#if ENABLE_MLOCK
41# include <sys/mman.h>
42#endif
43
17#include <cerrno> 44#include <cerrno>
18 45
19extern char **environ; 46#include "rxvt.h"
47#include "rxvtdaemon.h"
48#include "libptytty.h"
20 49
21struct server : rxvt_connection { 50struct server : rxvt_connection {
51 log_callback log_cb;
52 getfd_callback getfd_cb;
53
22 void read_cb (io_watcher &w, short revents); io_watcher read_ev; 54 void read_cb (ev::io &w, int revents); ev::io read_ev;
55 void log_msg (const char *msg);
56 int getfd (int remote_fd);
23 57
24 server (int fd) 58 server (int fd)
25 : read_ev (this, &server::read_cb)
26 { 59 {
60 read_ev.set <server, &server::read_cb> (this);
61 log_cb.set <server, &server::log_msg> (this);
62 getfd_cb.set<server, &server::getfd> (this);
63
27 this->fd = fd; 64 this->fd = fd;
65 fcntl (fd, F_SETFD, FD_CLOEXEC);
66 fcntl (fd, F_SETFL, 0);
28 read_ev.start (fd, EVENT_READ); 67 read_ev.start (fd, ev::READ);
29 } 68 }
30 69
31 void err (const char *format = 0, ...); 70 void err (const char *format = 0, ...);
32}; 71};
33 72
34struct unix_listener { 73struct unix_listener {
35 int fd; 74 int fd;
36 75
37 void accept_cb (io_watcher &w, short revents); io_watcher accept_ev; 76 void accept_cb (ev::io &w, int revents); ev::io accept_ev;
38 77
39 unix_listener (const char *sockname); 78 unix_listener (const char *sockname);
40}; 79};
41 80
42unix_listener::unix_listener (const char *sockname) 81unix_listener::unix_listener (const char *sockname)
43: accept_ev (this, &unix_listener::accept_cb)
44{ 82{
83 accept_ev.set<unix_listener, &unix_listener::accept_cb> (this);
84
85 sockaddr_un sa;
86
87 if (strlen (sockname) >= sizeof(sa.sun_path))
88 {
89 fputs ("socket name too long, aborting.\n", stderr);
90 exit (EXIT_FAILURE);
91 }
92
45 if ((fd = socket (PF_LOCAL, SOCK_STREAM, 0)) < 0) 93 if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
46 { 94 {
47 perror ("unable to create listening socket"); 95 perror ("unable to create listening socket");
48 exit (EXIT_FAILURE); 96 exit (EXIT_FAILURE);
49 } 97 }
50 98
51 sockaddr_un sa; 99 fcntl (fd, F_SETFD, FD_CLOEXEC);
100 fcntl (fd, F_SETFL, O_NONBLOCK);
52 101
53 sa.sun_family = AF_UNIX; 102 sa.sun_family = AF_UNIX;
54 strcpy (sa.sun_path, sockname); 103 strcpy (sa.sun_path, sockname);
55 104
56 unlink (rxvt_connection::unix_sockname ()); 105 unlink (rxvt_connection::unix_sockname ());
… …
69 { 118 {
70 perror ("unable to listen on socket"); 119 perror ("unable to listen on socket");
71 exit (EXIT_FAILURE); 120 exit (EXIT_FAILURE);
72 } 121 }
73 122
74 accept_ev.start (fd, EVENT_READ); 123 accept_ev.start (fd, ev::READ);
75} 124}
76 125
77void unix_listener::accept_cb (io_watcher &w, short revents) 126void unix_listener::accept_cb (ev::io &w, int revents)
78{ 127{
79 int fd2 = accept (fd, 0, 0); 128 int fd2 = accept (fd, 0, 0);
80 129
81 if (fd2 >= 0) 130 if (fd2 >= 0)
82 new server (fd2); 131 new server (fd2);
132}
133
134int server::getfd (int remote_fd)
135{
136 send ("GETFD");
137 send (remote_fd);
138 return ptytty::recv_fd (fd);
139}
140
141void server::log_msg (const char *msg)
142{
143 send ("MSG"), send (msg);
83} 144}
84 145
85void server::err (const char *format, ...) 146void server::err (const char *format, ...)
86{ 147{
87 if (format) 148 if (format)
… …
91 va_list ap; 152 va_list ap;
92 va_start (ap, format); 153 va_start (ap, format);
93 vsnprintf (err, 1024, format, ap); 154 vsnprintf (err, 1024, format, ap);
94 va_end (ap); 155 va_end (ap);
95 156
157 log_msg (err);
158 }
159
96 send ("ERR"), send (err); 160 send ("END"), send (0);
97 }
98
99 close (fd); 161 close (fd);
100 delete this; 162 delete this;
101} 163}
102 164
103void server::read_cb (io_watcher &w, short revents) 165void server::read_cb (ev::io &w, int revents)
104{ 166{
105 auto_str tok; 167 auto_str tok;
106 168
107 if (recv (tok)) 169 if (recv (tok))
108 { 170 {
109 if (!strcmp (tok, "NEW")) 171 if (!strcmp (tok, "NEW"))
110 { 172 {
111 stringvec *argv = new stringvec; 173 stringvec *argv = new stringvec;
112 stringvec *envv = new stringvec; 174 stringvec *envv = new stringvec;
113 175
114 for (;;) 176 for (;;)
115 { 177 {
116 if (!recv (tok)) 178 if (!recv (tok))
117 return err (); 179 return err ();
118 180
119 if (!strcmp (tok, "END")) 181 if (!strcmp (tok, "END"))
120 break; 182 break;
121 else if (!strcmp (tok, "ENV") && recv (tok)) 183 else if (!strcmp (tok, "ENV") && recv (tok))
122 envv->push_back (tok.get ()); 184 envv->push_back (strdup (tok));
123 else if (!strcmp (tok, "CWD") && recv (tok))
124 {
125 if (chdir (tok))
126 err ("unable to change to working directory to '%s': %s",
127 (char *)tok, strerror (errno));
128 }
129 else if (!strcmp (tok, "ARG") && recv (tok)) 185 else if (!strcmp (tok, "ARG") && recv (tok))
130 argv->push_back (tok.get ()); 186 argv->push_back (strdup (tok));
131 else 187 else
132 return err ("protocol error: unexpected NEW token"); 188 return err ("protocol error: unexpected NEW token.\n");
133 } 189 }
134 190
135 envv->push_back (0); 191 envv->push_back (0);
136 192
137 { 193 {
138 char **old_environ = environ; 194 rxvt_term *term = new rxvt_term;
139 environ = envv->begin ();
140 195
141 rxvt_term *term = rxvt_init (argv->size (), argv->begin ()); 196 term->log_hook = &log_cb;
197 term->getfd_hook = &getfd_cb;
142 198
199 bool success = true;
200
201 try
202 {
203 term->init (argv, envv);
204 }
205 catch (const class rxvt_failure_exception &e)
206 {
207 success = false;
208 }
209
143 term->argv = argv; 210 term->log_hook = 0;
144 term->envv = envv;
145 211
146 environ = old_environ; 212 chdir ("/"); // init might change to different working directory
213
214 if (!success)
215 term->destroy ();
216
217 send ("END"); send (success ? 1 : 0);
147 } 218 }
148 } 219 }
149 else 220 else
150 return err ("protocol error: request '%s' unsupported.", (char *)tok); 221 return err ("protocol error: request '%s' unsupported.\n", (char *)tok);
151 } 222 }
152 else 223 else
153 return err (); 224 return err ();
154} 225}
155 226
227int opt_fork, opt_opendisplay, opt_quiet;
228#if ENABLE_MLOCK
229int opt_lock;
230#endif
231
156int 232int
157main (int argc, const char *const *argv) 233main (int argc, const char *const *argv)
158{ 234{
159 rxvt_init_signals (); 235 rxvt_init ();
236
237 for (int i = 1; i < argc; i++)
238 {
239 if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork"))
240 opt_fork = 1;
241 else if (!strcmp (argv [i], "-o") || !strcmp (argv [i], "--opendisplay"))
242 opt_opendisplay = 1;
243 else if (!strcmp (argv [i], "-q") || !strcmp (argv [i], "--quiet"))
244 opt_quiet = 1;
245#if ENABLE_MLOCK
246 else if (!strcmp (argv [i], "-m") || !strcmp (argv [i], "--mlock"))
247 opt_lock = 1;
248#endif
249 else
250 {
251 rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]);
252 return EXIT_FAILURE;
253 }
254 }
255
256 // optionally open display and never release it.
257 if (opt_opendisplay)
258 if (const char *dpy = getenv ("DISPLAY"))
259 displays.get (dpy ? dpy : ":0"); // move string logic into rxvt_display maybe?
160 260
161 char *sockname = rxvt_connection::unix_sockname (); 261 char *sockname = rxvt_connection::unix_sockname ();
162 unix_listener l (sockname); 262 unix_listener l (sockname);
263
264 chdir ("/");
265
266 if (!opt_quiet)
267 {
163 printf ("rxvtd listening on %s.\n", sockname); 268 printf ("rxvt-unicode daemon listening on %s.\n", sockname);
269 fflush (stdout);
270 }
271
164 free (sockname); 272 free (sockname);
165 273
166 iom.loop (); 274 pid_t pid = 0;
275 if (opt_fork)
276 {
277 pid = fork ();
278 }
167 279
168#if 0 280#if ENABLE_MLOCK
169 if (rxvt_init (argc, argv) == NULL) 281 // Optionally perform an mlockall so this process does not get swapped out.
282 if (opt_lock && !pid)
283 if (mlockall (MCL_CURRENT | MCL_FUTURE) < 0)
284 perror ("unable to lock into ram");
285#endif
286
287 if (opt_fork)
288 {
289 if (pid < 0)
290 {
291 rxvt_log ("unable to fork daemon, aborting.\n");
170 return EXIT_FAILURE; 292 return EXIT_FAILURE;
293 }
294 else if (pid > 0)
295 _exit (EXIT_SUCCESS);
171 296
172 dR; 297 ev_default_fork ();
173 rxvt_main_loop (aR); /* main processing loop */ 298 }
174#endif 299
300 ev_loop (0);
301
175 return EXIT_SUCCESS; 302 return EXIT_SUCCESS;
176} 303}
177 304

Diff Legend

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