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

Diff Legend

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