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.31 by root, Fri Aug 18 23:03:31 2006 UTC vs.
Revision 1.57 by sf-exg, Tue Dec 6 11:29:52 2011 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 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))
77 { 88 {
78 fputs ("socket name too long, aborting.\n", stderr); 89 fputs ("socket name too long, aborting.\n", stderr);
79 exit (EXIT_FAILURE); 90 exit (EXIT_FAILURE);
80 } 91 }
… …
84 perror ("unable to create listening socket"); 95 perror ("unable to create listening socket");
85 exit (EXIT_FAILURE); 96 exit (EXIT_FAILURE);
86 } 97 }
87 98
88 fcntl (fd, F_SETFD, FD_CLOEXEC); 99 fcntl (fd, F_SETFD, FD_CLOEXEC);
100 fcntl (fd, F_SETFL, O_NONBLOCK);
89 101
90 sa.sun_family = AF_UNIX; 102 sa.sun_family = AF_UNIX;
91 strcpy (sa.sun_path, sockname); 103 strcpy (sa.sun_path, sockname);
92 104
93 unlink (rxvt_connection::unix_sockname ()); 105 unlink (sockname);
94 106
95 mode_t omask = umask (0077); 107 mode_t omask = umask (0077);
96 108
97 if (bind (fd, (sockaddr *)&sa, sizeof (sa))) 109 if (bind (fd, (sockaddr *)&sa, sizeof (sa)))
98 { 110 {
… …
106 { 118 {
107 perror ("unable to listen on socket"); 119 perror ("unable to listen on socket");
108 exit (EXIT_FAILURE); 120 exit (EXIT_FAILURE);
109 } 121 }
110 122
111 accept_ev.start (fd, EVENT_READ); 123 accept_ev.start (fd, ev::READ);
112} 124}
113 125
114void unix_listener::accept_cb (io_watcher &w, short revents) 126void unix_listener::accept_cb (ev::io &w, int revents)
115{ 127{
116 int fd2 = accept (fd, 0, 0); 128 int fd2 = accept (fd, 0, 0);
117 129
118 if (fd2 >= 0) 130 if (fd2 >= 0)
119 {
120 fcntl (fd2, F_SETFD, FD_CLOEXEC);
121 new server (fd2); 131 new server (fd2);
122 }
123} 132}
124 133
125int server::getfd (int remote_fd) 134int server::getfd (int remote_fd)
126{ 135{
127 send ("GETFD"); 136 send ("GETFD");
… …
143 va_list ap; 152 va_list ap;
144 va_start (ap, format); 153 va_start (ap, format);
145 vsnprintf (err, 1024, format, ap); 154 vsnprintf (err, 1024, format, ap);
146 va_end (ap); 155 va_end (ap);
147 156
148 send ("MSG"), send (err); 157 log_msg (err);
149 } 158 }
150 159
151 send ("END"); send (0); 160 send ("END"), send (0);
152 close (fd); 161 close (fd);
153 delete this; 162 delete this;
154} 163}
155 164
156void server::read_cb (io_watcher &w, short revents) 165void server::read_cb (ev::io &w, int revents)
157{ 166{
158 auto_str tok; 167 auto_str tok;
159 168
160 if (recv (tok)) 169 if (recv (tok))
161 { 170 {
162 if (!strcmp (tok, "NEW")) 171 if (!strcmp (tok, "NEW"))
163 { 172 {
164 stringvec *argv = new stringvec; 173 stringvec *argv = new stringvec;
165 stringvec *envv = new stringvec; 174 stringvec *envv = new stringvec;
166 175
167 for (;;) 176 for (;;)
168 { 177 {
169 if (!recv (tok)) 178 if (!recv (tok))
170 return err (); 179 return err ();
171 180
172 if (!strcmp (tok, "END")) 181 if (!strcmp (tok, "END"))
173 break; 182 break;
174 else if (!strcmp (tok, "ENV") && recv (tok)) 183 else if (!strcmp (tok, "ENV") && recv (tok))
175 envv->push_back (strdup (tok)); 184 envv->push_back (strdup (tok));
176 else if (!strcmp (tok, "CWD") && recv (tok))
177 {
178 if (chdir (tok))
179 {
180 delete envv;
181 delete argv;
182 return err ("unable to change to working directory to '%s', aborting: %s.\n",
183 (char *)tok, strerror (errno));
184 }
185 }
186 else if (!strcmp (tok, "ARG") && recv (tok)) 185 else if (!strcmp (tok, "ARG") && recv (tok))
187 argv->push_back (strdup (tok)); 186 argv->push_back (strdup (tok));
188 else 187 else
189 return err ("protocol error: unexpected NEW token.\n"); 188 return err ("protocol error: unexpected NEW token.\n");
190 } 189 }
191 190
192 envv->push_back (0);
193
194 { 191 {
195 rxvt_term *term = new rxvt_term; 192 rxvt_term *term = new rxvt_term;
196 193
197 term->log_hook = &log_cb; 194 term->log_hook = &log_cb;
198 term->getfd_hook = &getfd_cb; 195 term->getfd_hook = &getfd_cb;
199 196
200 bool success; 197 bool success = true;
201 198
202 try 199 try
203 { 200 {
204 success = term->init (argv, envv); 201 term->init (argv, envv);
205 } 202 }
206 catch (const class rxvt_failure_exception &e) 203 catch (const class rxvt_failure_exception &e)
207 { 204 {
208 success = false; 205 success = false;
209 } 206 }
210 207
211 term->log_hook = 0; 208 term->log_hook = 0;
212 209
213 chdir ("/"); 210 chdir ("/"); // init might change to different working directory
214 211
215 if (!success) 212 if (!success)
216 term->destroy (); 213 term->destroy ();
217 214
218 send ("END"); send (success ? 1 : 0); 215 send ("END"); send (success ? 1 : 0);
… …
223 } 220 }
224 else 221 else
225 return err (); 222 return err ();
226} 223}
227 224
228int opt_fork, opt_opendisplay, opt_quiet;
229
230int 225int
231main (int argc, const char *const *argv) 226main (int argc, const char *const *argv)
232{ 227{
233 rxvt_init (); 228 ptytty::init ();
229
230 static char opt_fork, opt_opendisplay, opt_quiet;
231#if ENABLE_MLOCK
232 static char opt_lock;
233#endif
234 234
235 for (int i = 1; i < argc; i++) 235 for (int i = 1; i < argc; i++)
236 { 236 {
237 if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork")) 237 if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork"))
238 opt_fork = 1; 238 opt_fork = 1;
239 else if (!strcmp (argv [i], "-o") || !strcmp (argv [i], "--opendisplay")) 239 else if (!strcmp (argv [i], "-o") || !strcmp (argv [i], "--opendisplay"))
240 opt_opendisplay = 1; 240 opt_opendisplay = 1;
241 else if (!strcmp (argv [i], "-q") || !strcmp (argv [i], "--quiet")) 241 else if (!strcmp (argv [i], "-q") || !strcmp (argv [i], "--quiet"))
242 opt_quiet = 1; 242 opt_quiet = 1;
243#if ENABLE_MLOCK
244 else if (!strcmp (argv [i], "-m") || !strcmp (argv [i], "--mlock"))
245 opt_lock = 1;
246#endif
243 else 247 else
244 { 248 {
245 rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]); 249 rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]);
246 return EXIT_FAILURE; 250 return EXIT_FAILURE;
247 } 251 }
248 } 252 }
249
250 chdir ("/");
251 253
254 rxvt_init ();
255
256 // optionally open display and never release it.
252 if (opt_opendisplay) 257 if (opt_opendisplay)
253 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?
254 260
255 char *sockname = rxvt_connection::unix_sockname (); 261 char *sockname = rxvt_connection::unix_sockname ();
256 unix_listener l (sockname); 262 unix_listener l (sockname);
257 263
264 chdir ("/");
265
258 if (!opt_quiet) 266 if (!opt_quiet)
259 { 267 {
260 printf ("rxvt-unicode daemon listening on %s.\n", sockname); 268 printf ("rxvt-unicode daemon listening on %s.\n", sockname);
261 fflush (stdout); 269 fflush (stdout);
262 } 270 }
263 271
264 free (sockname); 272 free (sockname);
265 273
274 pid_t pid = 0;
266 if (opt_fork) 275 if (opt_fork)
267 { 276 {
268 pid_t pid = fork (); 277 pid = fork ();
278 }
269 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 {
270 if (pid < 0) 289 if (pid < 0)
271 { 290 {
272 rxvt_log ("unable to fork daemon, aborting.\n"); 291 rxvt_log ("unable to fork daemon, aborting.\n");
273 return EXIT_FAILURE; 292 return EXIT_FAILURE;
274 } 293 }
275 else if (pid > 0) 294 else if (pid > 0)
276 _exit (EXIT_SUCCESS); 295 _exit (EXIT_SUCCESS);
277 }
278 296
279 io_manager::loop (); 297 ev_loop_fork (EV_DEFAULT_UC);
298 }
299
300 ev_run ();
280 301
281 return EXIT_SUCCESS; 302 return EXIT_SUCCESS;
282} 303}
283 304

Diff Legend

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