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.15 by root, Fri Aug 13 22:38:57 2004 UTC vs.
Revision 1.38 by root, Sun Nov 18 00:47:13 2007 UTC

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

Diff Legend

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