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.22 by root, Fri Dec 23 14:46:35 2005 UTC vs.
Revision 1.29 by root, Mon Feb 20 22:42:00 2006 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 "fdpass.h"
27#include "iom.h"
28
29#include <cstdio> 24#include <cstdio>
30#include <cstdlib> 25#include <cstdlib>
31#include <cstdarg> 26#include <cstdarg>
32#include <cstring> 27#include <cstring>
33 28
… …
38#include <sys/socket.h> 33#include <sys/socket.h>
39#include <sys/un.h> 34#include <sys/un.h>
40 35
41#include <cerrno> 36#include <cerrno>
42 37
43extern char **environ; 38#include "rxvt.h"
39#include "rxvtdaemon.h"
40#include "libptytty.h"
41#include "iom.h"
44 42
45struct server : rxvt_connection { 43struct server : rxvt_connection {
46 log_callback log_cb; 44 log_callback log_cb;
47 getfd_callback getfd_cb; 45 getfd_callback getfd_cb;
48 46
… …
71}; 69};
72 70
73unix_listener::unix_listener (const char *sockname) 71unix_listener::unix_listener (const char *sockname)
74: accept_ev (this, &unix_listener::accept_cb) 72: accept_ev (this, &unix_listener::accept_cb)
75{ 73{
76 if ((fd = socket (PF_UNIX, SOCK_STREAM, 0)) < 0) 74 if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
77 { 75 {
78 perror ("unable to create listening socket"); 76 perror ("unable to create listening socket");
79 exit (EXIT_FAILURE); 77 exit (EXIT_FAILURE);
80 } 78 }
81 79
… …
118 } 116 }
119} 117}
120 118
121int server::getfd (int remote_fd) 119int server::getfd (int remote_fd)
122{ 120{
123#if ENABLE_FRILLS && HAVE_UNIX_FDPASS
124 send ("GETFD"); 121 send ("GETFD");
125 send (remote_fd); 122 send (remote_fd);
126 return rxvt_recv_fd (fd); 123 return ptytty::recv_fd (fd);
127#else
128 return -1;
129#endif
130} 124}
131 125
132void server::log_msg (const char *msg) 126void server::log_msg (const char *msg)
133{ 127{
134 send ("MSG"), send (msg); 128 send ("MSG"), send (msg);
… …
170 return err (); 164 return err ();
171 165
172 if (!strcmp (tok, "END")) 166 if (!strcmp (tok, "END"))
173 break; 167 break;
174 else if (!strcmp (tok, "ENV") && recv (tok)) 168 else if (!strcmp (tok, "ENV") && recv (tok))
175 envv->push_back (tok.get ()); 169 envv->push_back (strdup (tok));
176 else if (!strcmp (tok, "CWD") && recv (tok)) 170 else if (!strcmp (tok, "CWD") && recv (tok))
177 { 171 {
178 if (chdir (tok)) 172 if (chdir (tok))
179 err ("unable to change to working directory to '%s': %s", 173 err ("unable to change to working directory to '%s': %s",
180 (char *)tok, strerror (errno)); 174 (char *)tok, strerror (errno));
181 } 175 }
182 else if (!strcmp (tok, "ARG") && recv (tok)) 176 else if (!strcmp (tok, "ARG") && recv (tok))
183 argv->push_back (tok.get ()); 177 argv->push_back (strdup (tok));
184 else 178 else
185 return err ("protocol error: unexpected NEW token"); 179 return err ("protocol error: unexpected NEW token");
186 } 180 }
187 181
188 envv->push_back (0); 182 envv->push_back (0);
189 183
190 { 184 {
191 char **old_environ = environ;
192 environ = envv->begin ();
193
194 rxvt_term *term = new rxvt_term; 185 rxvt_term *term = new rxvt_term;
195 186
196 term->log_hook = &log_cb; 187 term->log_hook = &log_cb;
197 term->getfd_hook = &getfd_cb; 188 term->getfd_hook = &getfd_cb;
198 term->argv = argv;
199 term->envv = envv;
200 189
201 bool success; 190 bool success;
202 191
203 try 192 try
204 { 193 {
205 success = term->init (argv->size (), argv->begin ()); 194 success = term->init (argv, envv);
206 } 195 }
207 catch (const class rxvt_failure_exception &e) 196 catch (const class rxvt_failure_exception &e)
208 { 197 {
209 success = false; 198 success = false;
210 } 199 }
211 200
212 term->log_hook = 0; 201 term->log_hook = 0;
213 202
214 environ = old_environ;
215 chdir ("/"); 203 chdir ("/");
216 204
217 if (!success) 205 if (!success)
218 term->destroy (); 206 term->destroy ();
219 207
… …
230int opt_fork, opt_opendisplay, opt_quiet; 218int opt_fork, opt_opendisplay, opt_quiet;
231 219
232int 220int
233main (int argc, const char *const *argv) 221main (int argc, const char *const *argv)
234{ 222{
223 rxvt_init ();
224
235 for (int i = 1; i < argc; i++) 225 for (int i = 1; i < argc; i++)
236 { 226 {
237 if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork")) 227 if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork"))
238 opt_fork = 1; 228 opt_fork = 1;
239 else if (!strcmp (argv [i], "-o") || !strcmp (argv [i], "--opendisplay")) 229 else if (!strcmp (argv [i], "-o") || !strcmp (argv [i], "--opendisplay"))
… …
245 rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]); 235 rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]);
246 return EXIT_FAILURE; 236 return EXIT_FAILURE;
247 } 237 }
248 } 238 }
249 239
250 rxvt_init ();
251
252 chdir ("/"); 240 chdir ("/");
253 241
254 if (opt_opendisplay) 242 if (opt_opendisplay)
255 displays.get (getenv ("DISPLAY")); // open display and never release it 243 displays.get (getenv ("DISPLAY")); // open display and never release it
256 244

Diff Legend

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