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.62 by sf-exg, Mon Oct 6 11:14:49 2014 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 <schmorp@schmorp.de>
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 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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 <cstdio> 24#include <stdio.h>
25#include <cstdlib> 25#include <stdlib.h>
26#include <cstdarg> 26#include <stdarg.h>
27#include <cstring> 27#include <string.h>
28 28
29#include <unistd.h> 29#include <unistd.h>
30#include <fcntl.h> 30#include <fcntl.h>
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 <errno.h>
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 (sockname);
91 106
92 mode_t omask = umask (0077); 107 mode_t omask = umask (0077);
93 108
94 if (bind (fd, (sockaddr *)&sa, sizeof (sa))) 109 if (bind (fd, (sockaddr *)&sa, sizeof (sa)))
95 { 110 {
… …
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
185 envv->push_back (0);
186 190
187 { 191 {
188 rxvt_term *term = new rxvt_term; 192 rxvt_term *term = new rxvt_term;
189 193
190 term->log_hook = &log_cb; 194 term->log_hook = &log_cb;
191 term->getfd_hook = &getfd_cb; 195 term->getfd_hook = &getfd_cb;
192 196
193 bool success; 197 bool success = true;
194 198
195 try 199 try
196 { 200 {
197 success = term->init (argv, envv); 201 term->init (argv, envv);
198 } 202 }
199 catch (const class rxvt_failure_exception &e) 203 catch (const class rxvt_failure_exception &e)
200 { 204 {
201 success = false; 205 success = false;
202 } 206 }
203 207
204 term->log_hook = 0; 208 term->log_hook = 0;
205 209
206 chdir ("/"); 210 chdir ("/"); // init might change to different working directory
207 211
208 if (!success) 212 if (!success)
209 term->destroy (); 213 term->destroy ();
210 214
211 send ("END"); send (success ? 1 : 0); 215 send ("END"); send (success ? 1 : 0);
212 } 216 }
213 } 217 }
218 else if (!strcmp (tok, "QUIT"))
219 _exit (0);
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, char *argv[])
225{ 229{
226 rxvt_init (); 230 ptytty::init ();
231
232 static char opt_fork, opt_opendisplay, opt_quiet;
233#if ENABLE_PERL
234 static char *opt_eval;
235#endif
236#if ENABLE_MLOCK
237 static char opt_lock;
238#endif
227 239
228 for (int i = 1; i < argc; i++) 240 for (int i = 1; i < argc; i++)
229 { 241 {
230 if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork")) 242 if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork"))
231 opt_fork = 1; 243 opt_fork = 1;
232 else if (!strcmp (argv [i], "-o") || !strcmp (argv [i], "--opendisplay")) 244 else if (!strcmp (argv [i], "-o") || !strcmp (argv [i], "--opendisplay"))
233 opt_opendisplay = 1; 245 opt_opendisplay = 1;
234 else if (!strcmp (argv [i], "-q") || !strcmp (argv [i], "--quiet")) 246 else if (!strcmp (argv [i], "-q") || !strcmp (argv [i], "--quiet"))
235 opt_quiet = 1; 247 opt_quiet = 1;
248#if ENABLE_MLOCK
249 else if (!strcmp (argv [i], "-m") || !strcmp (argv [i], "--mlock"))
250 opt_lock = 1;
251#endif
252#if ENABLE_PERL
253 else if (!strcmp (argv [i], "-e") || !strcmp (argv [i], "--eval"))
254 opt_eval = argv [++i];
255#endif
236 else 256 else
237 { 257 {
238 rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]); 258 rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]);
239 return EXIT_FAILURE; 259 return EXIT_FAILURE;
240 } 260 }
241 } 261 }
242
243 chdir ("/");
244 262
263 rxvt_init ();
264
265#if ENABLE_PERL
266 if (opt_eval)
267 {
268 rxvt_perl.init ();
269 rxvt_perl.eval (opt_eval);
270 }
271#endif
272
273 // optionally open display and never release it.
245 if (opt_opendisplay) 274 if (opt_opendisplay)
246 displays.get (getenv ("DISPLAY")); // open display and never release it 275 if (const char *dpy = getenv ("DISPLAY"))
276 displays.get (dpy ? dpy : ":0"); // move string logic into rxvt_display maybe?
247 277
248 char *sockname = rxvt_connection::unix_sockname (); 278 char *sockname = rxvt_connection::unix_sockname ();
249 unix_listener l (sockname); 279 unix_listener l (sockname);
250 280
281 chdir ("/");
282
251 if (!opt_quiet) 283 if (!opt_quiet)
252 { 284 {
253 printf ("rxvt-unicode daemon listening on %s.\n", sockname); 285 printf ("rxvt-unicode daemon listening on %s.\n", sockname);
254 fflush (stdout); 286 fflush (stdout);
255 } 287 }
256 288
257 free (sockname); 289 free (sockname);
258 290
291 pid_t pid = 0;
259 if (opt_fork) 292 if (opt_fork)
260 { 293 {
261 pid_t pid = fork (); 294 pid = fork ();
295 }
262 296
297#if ENABLE_MLOCK
298 // Optionally perform an mlockall so this process does not get swapped out.
299 if (opt_lock && !pid)
300 if (mlockall (MCL_CURRENT | MCL_FUTURE) < 0)
301 perror ("unable to lock into ram");
302#endif
303
304 if (opt_fork)
305 {
263 if (pid < 0) 306 if (pid < 0)
264 { 307 {
265 rxvt_log ("unable to fork daemon, aborting.\n"); 308 rxvt_log ("unable to fork daemon, aborting.\n");
266 return EXIT_FAILURE; 309 return EXIT_FAILURE;
267 } 310 }
268 else if (pid > 0) 311 else if (pid > 0)
269 _exit (EXIT_SUCCESS); 312 _exit (EXIT_SUCCESS);
270 }
271 313
272 io_manager::loop (); 314 ev_loop_fork (EV_DEFAULT_UC);
315 }
316
317 ev_run ();
273 318
274 return EXIT_SUCCESS; 319 return EXIT_SUCCESS;
275} 320}
276 321

Diff Legend

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