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.2 by pcg, Mon Nov 24 19:52:16 2003 UTC vs.
Revision 1.51 by root, Sun Oct 24 17:34:47 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>
26#include <cstdarg>
27#include <cstring>
7 28
8#include <unistd.h> 29#include <unistd.h>
30#include <fcntl.h>
31#include <sys/types.h>
32#include <sys/stat.h>
9#include <sys/socket.h> 33#include <sys/socket.h>
10#include <sys/un.h> 34#include <sys/un.h>
11 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
44#include <cerrno>
45
46#include "rxvt.h"
47#include "rxvtdaemon.h"
48#include "libptytty.h"
49
12struct server : rxvt_connection { 50struct server : rxvt_connection {
51 log_callback log_cb;
52 getfd_callback getfd_cb;
53
13 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);
14 57
15 server (int fd) 58 server (int fd)
16 : read_ev (this, &server::read_cb)
17 { 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
18 this->fd = fd; 64 this->fd = fd;
65 fcntl (fd, F_SETFD, FD_CLOEXEC);
66 fcntl (fd, F_SETFL, 0);
19 read_ev.start (fd, EVENT_READ); 67 read_ev.start (fd, ev::READ);
20 } 68 }
21 69
22 void err (); 70 void err (const char *format = 0, ...);
23}; 71};
24 72
25struct listener { 73struct unix_listener {
26 int fd; 74 int fd;
27 75
28 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;
29 77
30 listener (); 78 unix_listener (const char *sockname);
31}; 79};
32 80
33listener::listener () 81unix_listener::unix_listener (const char *sockname)
34: accept_ev (this, &listener::accept_cb)
35{ 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
36 if ((fd = socket (PF_LOCAL, SOCK_STREAM, 0)) < 0) 93 if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
37 { 94 {
38 perror ("unable to create listening socket"); 95 perror ("unable to create listening socket");
39 exit (EXIT_FAILURE); 96 exit (EXIT_FAILURE);
40 } 97 }
41 98
42 sockaddr_un sa; 99 fcntl (fd, F_SETFD, FD_CLOEXEC);
100 fcntl (fd, F_SETFL, O_NONBLOCK);
43 101
44 sa.sun_family = AF_UNIX; 102 sa.sun_family = AF_UNIX;
45 strcpy (sa.sun_path, rxvt_connection::unix_sockname ()); 103 strcpy (sa.sun_path, sockname);
46 104
47 unlink (rxvt_connection::unix_sockname ()); 105 unlink (rxvt_connection::unix_sockname ());
106
107 mode_t omask = umask (0077);
48 108
49 if (bind (fd, (sockaddr *)&sa, sizeof (sa))) 109 if (bind (fd, (sockaddr *)&sa, sizeof (sa)))
50 { 110 {
51 perror ("unable to bind listening socket"); 111 perror ("unable to bind listening socket");
52 exit (EXIT_FAILURE); 112 exit (EXIT_FAILURE);
53 } 113 }
54 114
115 umask (omask);
116
55 if (listen (fd, 5)) 117 if (listen (fd, 5))
56 { 118 {
57 perror ("unable to listen on socket"); 119 perror ("unable to listen on socket");
58 exit (EXIT_FAILURE); 120 exit (EXIT_FAILURE);
59 } 121 }
60 122
61 accept_ev.start (fd, EVENT_READ); 123 accept_ev.start (fd, ev::READ);
62} 124}
63 125
64void listener::accept_cb (io_watcher &w, short revents) 126void unix_listener::accept_cb (ev::io &w, int revents)
65{ 127{
66 int fd2 = accept (fd, 0, 0); 128 int fd2 = accept (fd, 0, 0);
67 129
68 if (fd2 >= 0) 130 if (fd2 >= 0)
69 new server (fd2); 131 new server (fd2);
70} 132}
71 133
72void server::err () 134int server::getfd (int remote_fd)
73{ 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);
144}
145
146void server::err (const char *format, ...)
147{
148 if (format)
149 {
150 char err[1024];
151
152 va_list ap;
153 va_start (ap, format);
154 vsnprintf (err, 1024, format, ap);
155 va_end (ap);
156
157 log_msg (err);
158 }
159
160 send ("END"), send (0);
74 close (fd); 161 close (fd);
75 delete this; 162 delete this;
76} 163}
77 164
78void server::read_cb (io_watcher &w, short revents) 165void server::read_cb (ev::io &w, int revents)
79{ 166{
80 auto_str tok; 167 auto_str tok;
81 168
82 if (recv (tok)) 169 if (recv (tok))
83 { 170 {
84 if (!strcmp (tok, "NEW")) 171 if (!strcmp (tok, "NEW"))
85 { 172 {
86 auto_str display, cwd; 173 stringvec *argv = new stringvec;
87 simplevec<auto_str> argv; 174 stringvec *envv = new stringvec;
88 175
89 for (;;) 176 for (;;)
90 { 177 {
91 if (!recv (tok)) 178 if (!recv (tok))
92 return err (); 179 return err ();
93 180
94 if (!strcmp (tok, "END")) 181 if (!strcmp (tok, "END"))
95 break; 182 break;
96 else if (!strcmp (tok, "DISPLAY") && recv (display))
97 ;
98 else if (!strcmp (tok, "CWD") && recv (cwd)) 183 else if (!strcmp (tok, "ENV") && recv (tok))
99 ; 184 envv->push_back (strdup (tok));
100 else if (!strcmp (tok, "ARG") && recv (tok)) 185 else if (!strcmp (tok, "ARG") && recv (tok))
101 argv.push_back (tok); 186 argv->push_back (strdup (tok));
102 else 187 else
103 return err (); 188 return err ("protocol error: unexpected NEW token.\n");
104 } 189 }
105 190
106 // TODO: no setenv, please 191 envv->push_back (0);
107 setenv ("DISPLAY", display.get (), 1);
108 192
109 rxvt_init (argv.size (), reinterpret_cast<char **>(argv.begin ()));
110 dR; 193 {
111 rxvt_main_loop (aR); 194 rxvt_term *term = new rxvt_term;
195
196 term->log_hook = &log_cb;
197 term->getfd_hook = &getfd_cb;
198
199 bool success = true;
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);
218 }
112 } 219 }
113 else 220 else
114 return err (); 221 return err ("protocol error: request '%s' unsupported.\n", (char *)tok);
115 } 222 }
116 else 223 else
117 return err (); 224 return err ();
118} 225}
119 226
120int 227int
121main(int argc, const char *const *argv) 228main (int argc, const char *const *argv)
122{ 229{
123 listener l; 230 int opt_fork, opt_opendisplay, opt_quiet;
124 iom.loop (); 231#if ENABLE_MLOCK
232 int opt_lock;
233#endif
125 234
126#if 0 235 rxvt_init ();
127 if (rxvt_init(argc, argv) == NULL) 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]);
128 return EXIT_FAILURE; 252 return EXIT_FAILURE;
253 }
254 }
129 255
130 dR; 256 // optionally open display and never release it.
131 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");
132#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_loop_fork (EV_DEFAULT_UC);
298 }
299
300 ev_run ();
301
133 return EXIT_SUCCESS; 302 return EXIT_SUCCESS;
134} 303}
304

Diff Legend

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