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.10 by pcg, Wed Mar 17 05:15:02 2004 UTC vs.
Revision 1.46 by root, Sun Jun 15 13:54:15 2008 UTC

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

Diff Legend

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