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.22 by root, Fri Dec 23 14:46:35 2005 UTC

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

Diff Legend

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