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.4 by pcg, Tue Nov 25 17:34:47 2003 UTC vs.
Revision 1.49 by sf-exg, Sun Jul 25 00:47:58 2010 UTC

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

Diff Legend

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