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.9 by pcg, Fri Feb 13 13:28:17 2004 UTC vs.
Revision 1.41 by root, Tue Dec 4 16:24:00 2007 UTC

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

Diff Legend

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