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.20 by root, Mon Feb 14 20:46:47 2005 UTC vs.
Revision 1.26 by root, Sun Jan 22 00:36:59 2006 UTC

… …
21 *----------------------------------------------------------------------*/ 21 *----------------------------------------------------------------------*/
22 22
23#include "../config.h" 23#include "../config.h"
24#include "rxvt.h" 24#include "rxvt.h"
25#include "rxvtdaemon.h" 25#include "rxvtdaemon.h"
26#include "fdpass.h"
26#include "iom.h" 27#include "iom.h"
27 28
28#include <cstdio> 29#include <cstdio>
29#include <cstdlib> 30#include <cstdlib>
30#include <cstdarg> 31#include <cstdarg>
… …
41 42
42extern char **environ; 43extern char **environ;
43 44
44struct server : rxvt_connection { 45struct server : rxvt_connection {
45 log_callback log_cb; 46 log_callback log_cb;
47 getfd_callback getfd_cb;
46 48
47 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;
48 void log_msg (const char *msg); 50 void log_msg (const char *msg);
51 int getfd (int remote_fd);
49 52
50 server (int fd) 53 server (int fd)
51 : read_ev (this, &server::read_cb), 54 : read_ev (this, &server::read_cb),
52 log_cb (this, &server::log_msg) 55 log_cb (this, &server::log_msg),
56 getfd_cb (this, &server::getfd)
53 { 57 {
54 this->fd = fd; 58 this->fd = fd;
55 read_ev.start (fd, EVENT_READ); 59 read_ev.start (fd, EVENT_READ);
56 } 60 }
57 61
… …
67}; 71};
68 72
69unix_listener::unix_listener (const char *sockname) 73unix_listener::unix_listener (const char *sockname)
70: accept_ev (this, &unix_listener::accept_cb) 74: accept_ev (this, &unix_listener::accept_cb)
71{ 75{
72 if ((fd = socket (PF_UNIX, SOCK_STREAM, 0)) < 0) 76 if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
73 { 77 {
74 perror ("unable to create listening socket"); 78 perror ("unable to create listening socket");
75 exit (EXIT_FAILURE); 79 exit (EXIT_FAILURE);
76 } 80 }
77 81
… …
110 if (fd2 >= 0) 114 if (fd2 >= 0)
111 { 115 {
112 fcntl (fd2, F_SETFD, FD_CLOEXEC); 116 fcntl (fd2, F_SETFD, FD_CLOEXEC);
113 new server (fd2); 117 new server (fd2);
114 } 118 }
119}
120
121int server::getfd (int remote_fd)
122{
123 send ("GETFD");
124 send (remote_fd);
125 return rxvt_recv_fd (fd);
115} 126}
116 127
117void server::log_msg (const char *msg) 128void server::log_msg (const char *msg)
118{ 129{
119 send ("MSG"), send (msg); 130 send ("MSG"), send (msg);
… …
155 return err (); 166 return err ();
156 167
157 if (!strcmp (tok, "END")) 168 if (!strcmp (tok, "END"))
158 break; 169 break;
159 else if (!strcmp (tok, "ENV") && recv (tok)) 170 else if (!strcmp (tok, "ENV") && recv (tok))
160 envv->push_back (tok.get ()); 171 envv->push_back (strdup (tok));
161 else if (!strcmp (tok, "CWD") && recv (tok)) 172 else if (!strcmp (tok, "CWD") && recv (tok))
162 { 173 {
163 if (chdir (tok)) 174 if (chdir (tok))
164 err ("unable to change to working directory to '%s': %s", 175 err ("unable to change to working directory to '%s': %s",
165 (char *)tok, strerror (errno)); 176 (char *)tok, strerror (errno));
166 } 177 }
167 else if (!strcmp (tok, "ARG") && recv (tok)) 178 else if (!strcmp (tok, "ARG") && recv (tok))
168 argv->push_back (tok.get ()); 179 argv->push_back (strdup (tok));
169 else 180 else
170 return err ("protocol error: unexpected NEW token"); 181 return err ("protocol error: unexpected NEW token");
171 } 182 }
172 183
173 envv->push_back (0); 184 envv->push_back (0);
174 185
175 { 186 {
176 char **old_environ = environ;
177 environ = envv->begin ();
178
179 rxvt_term *term = new rxvt_term; 187 rxvt_term *term = new rxvt_term;
180 188
181 term->log_hook = &log_cb; 189 term->log_hook = &log_cb;
182 term->argv = argv; 190 term->getfd_hook = &getfd_cb;
183 term->envv = envv;
184 191
185 bool success; 192 bool success;
186 193
187 try 194 try
188 { 195 {
189 success = term->init (argv->size (), argv->begin ()); 196 success = term->init (argv, envv);
190 } 197 }
191 catch (const class rxvt_failure_exception &e) 198 catch (const class rxvt_failure_exception &e)
192 { 199 {
193 success = false; 200 success = false;
194 } 201 }
195 202
196 term->log_hook = 0; 203 term->log_hook = 0;
197 204
198 environ = old_environ;
199 chdir ("/"); 205 chdir ("/");
200 206
201 if (!success) 207 if (!success)
202 term->destroy (); 208 term->destroy ();
203 209
… …
209 } 215 }
210 else 216 else
211 return err (); 217 return err ();
212} 218}
213 219
220int opt_fork, opt_opendisplay, opt_quiet;
221
214int 222int
215main (int argc, const char *const *argv) 223main (int argc, const char *const *argv)
216{ 224{
217 rxvt_init (); 225 rxvt_init ();
218 226
227 for (int i = 1; i < argc; i++)
228 {
229 if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork"))
230 opt_fork = 1;
231 else if (!strcmp (argv [i], "-o") || !strcmp (argv [i], "--opendisplay"))
232 opt_opendisplay = 1;
233 else if (!strcmp (argv [i], "-q") || !strcmp (argv [i], "--quiet"))
234 opt_quiet = 1;
235 else
236 {
237 rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]);
238 return EXIT_FAILURE;
239 }
240 }
241
219 chdir ("/"); 242 chdir ("/");
243
244 if (opt_opendisplay)
245 displays.get (getenv ("DISPLAY")); // open display and never release it
220 246
221 char *sockname = rxvt_connection::unix_sockname (); 247 char *sockname = rxvt_connection::unix_sockname ();
222 unix_listener l (sockname); 248 unix_listener l (sockname);
249
250 if (!opt_quiet)
251 {
223 printf ("rxvt-unicode daemon listening on %s.\n", sockname); 252 printf ("rxvt-unicode daemon listening on %s.\n", sockname);
224 fflush (stdout); 253 fflush (stdout);
254 }
255
225 free (sockname); 256 free (sockname);
226 257
258 if (opt_fork)
259 {
260 pid_t pid = fork ();
261
262 if (pid < 0)
263 {
264 rxvt_log ("unable to fork daemon, aborting.\n");
265 return EXIT_FAILURE;
266 }
267 else if (pid > 0)
268 _exit (EXIT_SUCCESS);
269 }
270
227 io_manager::loop (); 271 io_manager::loop ();
228 272
229 return EXIT_SUCCESS; 273 return EXIT_SUCCESS;
230} 274}
231 275

Diff Legend

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