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.30 by root, Wed Aug 9 22:01:07 2006 UTC vs.
Revision 1.50 by root, Fri Oct 22 05:58:00 2010 UTC

1/*----------------------------------------------------------------------* 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-2006 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.
… …
31#include <sys/types.h> 31#include <sys/types.h>
32#include <sys/stat.h> 32#include <sys/stat.h>
33#include <sys/socket.h> 33#include <sys/socket.h>
34#include <sys/un.h> 34#include <sys/un.h>
35 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
36#include <cerrno> 44#include <cerrno>
37 45
38#include "rxvt.h" 46#include "rxvt.h"
39#include "rxvtdaemon.h" 47#include "rxvtdaemon.h"
40#include "libptytty.h" 48#include "libptytty.h"
41#include "iom.h"
42 49
43struct server : rxvt_connection { 50struct server : rxvt_connection {
44 log_callback log_cb; 51 log_callback log_cb;
45 getfd_callback getfd_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);
49 int getfd (int remote_fd); 56 int getfd (int remote_fd);
50 57
51 server (int fd) 58 server (int fd)
52 : read_ev (this, &server::read_cb),
53 log_cb (this, &server::log_msg),
54 getfd_cb (this, &server::getfd)
55 { 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
56 this->fd = fd; 64 this->fd = fd;
65 fcntl (fd, F_SETFD, FD_CLOEXEC);
66 fcntl (fd, F_SETFL, 0);
57 read_ev.start (fd, EVENT_READ); 67 read_ev.start (fd, ev::READ);
58 } 68 }
59 69
60 void err (const char *format = 0, ...); 70 void err (const char *format = 0, ...);
61}; 71};
62 72
63struct unix_listener { 73struct unix_listener {
64 int fd; 74 int fd;
65 75
66 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;
67 77
68 unix_listener (const char *sockname); 78 unix_listener (const char *sockname);
69}; 79};
70 80
71unix_listener::unix_listener (const char *sockname) 81unix_listener::unix_listener (const char *sockname)
72: accept_ev (this, &unix_listener::accept_cb)
73{ 82{
83 accept_ev.set<unix_listener, &unix_listener::accept_cb> (this);
84
74 sockaddr_un sa; 85 sockaddr_un sa;
75 86
76 if (strlen(sockname) >= sizeof(sa.sun_path)) 87 if (strlen (sockname) >= sizeof(sa.sun_path))
88 {
77 rxvt_fatal ("socket name too long, aborting.\n"); 89 fputs ("socket name too long, aborting.\n", stderr);
90 exit (EXIT_FAILURE);
91 }
78 92
79 if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0) 93 if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
80 { 94 {
81 perror ("unable to create listening socket"); 95 perror ("unable to create listening socket");
82 exit (EXIT_FAILURE); 96 exit (EXIT_FAILURE);
83 } 97 }
84 98
85 fcntl (fd, F_SETFD, FD_CLOEXEC); 99 fcntl (fd, F_SETFD, FD_CLOEXEC);
100 fcntl (fd, F_SETFL, O_NONBLOCK);
86 101
87 sa.sun_family = AF_UNIX; 102 sa.sun_family = AF_UNIX;
88 strcpy (sa.sun_path, sockname); 103 strcpy (sa.sun_path, sockname);
89 104
90 unlink (rxvt_connection::unix_sockname ()); 105 unlink (rxvt_connection::unix_sockname ());
… …
103 { 118 {
104 perror ("unable to listen on socket"); 119 perror ("unable to listen on socket");
105 exit (EXIT_FAILURE); 120 exit (EXIT_FAILURE);
106 } 121 }
107 122
108 accept_ev.start (fd, EVENT_READ); 123 accept_ev.start (fd, ev::READ);
109} 124}
110 125
111void unix_listener::accept_cb (io_watcher &w, short revents) 126void unix_listener::accept_cb (ev::io &w, int revents)
112{ 127{
113 int fd2 = accept (fd, 0, 0); 128 int fd2 = accept (fd, 0, 0);
114 129
115 if (fd2 >= 0) 130 if (fd2 >= 0)
116 {
117 fcntl (fd2, F_SETFD, FD_CLOEXEC);
118 new server (fd2); 131 new server (fd2);
119 }
120} 132}
121 133
122int server::getfd (int remote_fd) 134int server::getfd (int remote_fd)
123{ 135{
124 send ("GETFD"); 136 send ("GETFD");
… …
140 va_list ap; 152 va_list ap;
141 va_start (ap, format); 153 va_start (ap, format);
142 vsnprintf (err, 1024, format, ap); 154 vsnprintf (err, 1024, format, ap);
143 va_end (ap); 155 va_end (ap);
144 156
145 send ("MSG"), send (err); 157 log_msg (err);
146 } 158 }
147 159
148 send ("END", 0); 160 send ("END"), send (0);
149 close (fd); 161 close (fd);
150 delete this; 162 delete this;
151} 163}
152 164
153void server::read_cb (io_watcher &w, short revents) 165void server::read_cb (ev::io &w, int revents)
154{ 166{
155 auto_str tok; 167 auto_str tok;
156 168
157 if (recv (tok)) 169 if (recv (tok))
158 { 170 {
159 if (!strcmp (tok, "NEW")) 171 if (!strcmp (tok, "NEW"))
160 { 172 {
161 stringvec *argv = new stringvec; 173 stringvec *argv = new stringvec;
162 stringvec *envv = new stringvec; 174 stringvec *envv = new stringvec;
163 175
164 for (;;) 176 for (;;)
165 { 177 {
166 if (!recv (tok)) 178 if (!recv (tok))
167 return err (); 179 return err ();
168 180
169 if (!strcmp (tok, "END")) 181 if (!strcmp (tok, "END"))
170 break; 182 break;
171 else if (!strcmp (tok, "ENV") && recv (tok)) 183 else if (!strcmp (tok, "ENV") && recv (tok))
172 envv->push_back (strdup (tok)); 184 envv->push_back (strdup (tok));
173 else if (!strcmp (tok, "CWD") && recv (tok))
174 {
175 if (chdir (tok))
176 err ("unable to change to working directory to '%s': %s",
177 (char *)tok, strerror (errno));
178 }
179 else if (!strcmp (tok, "ARG") && recv (tok)) 185 else if (!strcmp (tok, "ARG") && recv (tok))
180 argv->push_back (strdup (tok)); 186 argv->push_back (strdup (tok));
181 else 187 else
182 return err ("protocol error: unexpected NEW token"); 188 return err ("protocol error: unexpected NEW token.\n");
183 } 189 }
184 190
185 envv->push_back (0); 191 envv->push_back (0);
186 192
187 { 193 {
188 rxvt_term *term = new rxvt_term; 194 rxvt_term *term = new rxvt_term;
189 195
190 term->log_hook = &log_cb; 196 term->log_hook = &log_cb;
191 term->getfd_hook = &getfd_cb; 197 term->getfd_hook = &getfd_cb;
192 198
193 bool success; 199 bool success = true;
194 200
195 try 201 try
196 { 202 {
197 success = term->init (argv, envv); 203 term->init (argv, envv);
198 } 204 }
199 catch (const class rxvt_failure_exception &e) 205 catch (const class rxvt_failure_exception &e)
200 { 206 {
201 success = false; 207 success = false;
202 } 208 }
203 209
204 term->log_hook = 0; 210 term->log_hook = 0;
205 211
206 chdir ("/"); 212 chdir ("/"); // init might change to different working directory
207 213
208 if (!success) 214 if (!success)
209 term->destroy (); 215 term->destroy ();
210 216
211 send ("END"); send (success ? 1 : 0); 217 send ("END"); send (success ? 1 : 0);
212 } 218 }
213 } 219 }
214 else 220 else
215 return err ("protocol error: request '%s' unsupported.", (char *)tok); 221 return err ("protocol error: request '%s' unsupported.\n", (char *)tok);
216 } 222 }
217 else 223 else
218 return err (); 224 return err ();
219} 225}
220 226
221int opt_fork, opt_opendisplay, opt_quiet;
222
223int 227int
224main (int argc, const char *const *argv) 228main (int argc, const char *const *argv)
225{ 229{
230 int opt_fork, opt_opendisplay, opt_quiet;
231#if ENABLE_MLOCK
232 int opt_lock;
233#endif
234
226 rxvt_init (); 235 rxvt_init ();
227 236
228 for (int i = 1; i < argc; i++) 237 for (int i = 1; i < argc; i++)
229 { 238 {
230 if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork")) 239 if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork"))
231 opt_fork = 1; 240 opt_fork = 1;
232 else if (!strcmp (argv [i], "-o") || !strcmp (argv [i], "--opendisplay")) 241 else if (!strcmp (argv [i], "-o") || !strcmp (argv [i], "--opendisplay"))
233 opt_opendisplay = 1; 242 opt_opendisplay = 1;
234 else if (!strcmp (argv [i], "-q") || !strcmp (argv [i], "--quiet")) 243 else if (!strcmp (argv [i], "-q") || !strcmp (argv [i], "--quiet"))
235 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
236 else 249 else
237 { 250 {
238 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]);
239 return EXIT_FAILURE; 252 return EXIT_FAILURE;
240 } 253 }
241 } 254 }
242
243 chdir ("/");
244 255
256 // optionally open display and never release it.
245 if (opt_opendisplay) 257 if (opt_opendisplay)
246 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?
247 260
248 char *sockname = rxvt_connection::unix_sockname (); 261 char *sockname = rxvt_connection::unix_sockname ();
249 unix_listener l (sockname); 262 unix_listener l (sockname);
250 263
264 chdir ("/");
265
251 if (!opt_quiet) 266 if (!opt_quiet)
252 { 267 {
253 printf ("rxvt-unicode daemon listening on %s.\n", sockname); 268 printf ("rxvt-unicode daemon listening on %s.\n", sockname);
254 fflush (stdout); 269 fflush (stdout);
255 } 270 }
256 271
257 free (sockname); 272 free (sockname);
258 273
274 pid_t pid = 0;
259 if (opt_fork) 275 if (opt_fork)
260 { 276 {
261 pid_t pid = fork (); 277 pid = fork ();
278 }
262 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 {
263 if (pid < 0) 289 if (pid < 0)
264 { 290 {
265 rxvt_log ("unable to fork daemon, aborting.\n"); 291 rxvt_log ("unable to fork daemon, aborting.\n");
266 return EXIT_FAILURE; 292 return EXIT_FAILURE;
267 } 293 }
268 else if (pid > 0) 294 else if (pid > 0)
269 _exit (EXIT_SUCCESS); 295 _exit (EXIT_SUCCESS);
270 }
271 296
272 io_manager::loop (); 297 ev_default_fork ();
298 }
299
300 ev_run ();
273 301
274 return EXIT_SUCCESS; 302 return EXIT_SUCCESS;
275} 303}
276 304

Diff Legend

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