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

Diff Legend

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