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.21 by root, Thu Jul 7 19:37:47 2005 UTC vs.
Revision 1.25 by root, Tue Jan 17 15:43:49 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);
… …
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;
190 term->getfd_hook = &getfd_cb;
182 term->argv = argv; 191 term->argv = argv;
183 term->envv = envv; 192 term->envv = envv;
184 193
185 bool success; 194 bool success;
186 195
… …
193 success = false; 202 success = false;
194 } 203 }
195 204
196 term->log_hook = 0; 205 term->log_hook = 0;
197 206
198 environ = old_environ;
199 chdir ("/"); 207 chdir ("/");
200 208
201 if (!success) 209 if (!success)
202 term->destroy (); 210 term->destroy ();
203 211
… …
214int opt_fork, opt_opendisplay, opt_quiet; 222int opt_fork, opt_opendisplay, opt_quiet;
215 223
216int 224int
217main (int argc, const char *const *argv) 225main (int argc, const char *const *argv)
218{ 226{
227 rxvt_init ();
228
219 for (int i = 1; i < argc; i++) 229 for (int i = 1; i < argc; i++)
220 { 230 {
221 if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork")) 231 if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork"))
222 opt_fork = 1; 232 opt_fork = 1;
223 else if (!strcmp (argv [i], "-o") || !strcmp (argv [i], "--opendisplay")) 233 else if (!strcmp (argv [i], "-o") || !strcmp (argv [i], "--opendisplay"))
… …
229 rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]); 239 rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]);
230 return EXIT_FAILURE; 240 return EXIT_FAILURE;
231 } 241 }
232 } 242 }
233 243
234 rxvt_init ();
235
236 chdir ("/"); 244 chdir ("/");
237 245
238 if (opt_opendisplay) 246 if (opt_opendisplay)
239 displays.get (getenv ("DISPLAY")); // open display and never release it 247 displays.get (getenv ("DISPLAY")); // open display and never release it
240 248

Diff Legend

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