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.21 by root, Thu Jul 7 19:37:47 2005 UTC vs.
Revision 1.48 by root, Fri May 8 23:52:55 2009 UTC

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

Diff Legend

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