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.32 by root, Fri Aug 18 23:06:48 2006 UTC

1/*----------------------------------------------------------------------*
2 * File: rxvtd.C
3 *----------------------------------------------------------------------*
4 *
5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2003-2006 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"
41#include "iom.h"
20 42
21struct server : rxvt_connection { 43struct server : rxvt_connection {
22 log_callback log_cb; 44 log_callback log_cb;
45 getfd_callback getfd_cb;
23 46
24 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;
25 void log_msg (const char *msg); 48 void log_msg (const char *msg);
49 int getfd (int remote_fd);
26 50
27 server (int fd) 51 server (int fd)
28 : read_ev (this, &server::read_cb), 52 : read_ev (this, &server::read_cb),
29 log_cb (this, &server::log_msg) 53 log_cb (this, &server::log_msg),
54 getfd_cb (this, &server::getfd)
30 { 55 {
31 this->fd = fd; 56 this->fd = fd;
32 read_ev.start (fd, EVENT_READ); 57 read_ev.start (fd, EVENT_READ);
33 } 58 }
34 59
… …
44}; 69};
45 70
46unix_listener::unix_listener (const char *sockname) 71unix_listener::unix_listener (const char *sockname)
47: accept_ev (this, &unix_listener::accept_cb) 72: accept_ev (this, &unix_listener::accept_cb)
48{ 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
49 if ((fd = socket (PF_LOCAL, SOCK_STREAM, 0)) < 0) 82 if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
50 { 83 {
51 perror ("unable to create listening socket"); 84 perror ("unable to create listening socket");
52 exit (EXIT_FAILURE); 85 exit (EXIT_FAILURE);
53 } 86 }
54 87
55 sockaddr_un sa; 88 fcntl (fd, F_SETFD, FD_CLOEXEC);
56 89
57 sa.sun_family = AF_UNIX; 90 sa.sun_family = AF_UNIX;
58 strcpy (sa.sun_path, sockname); 91 strcpy (sa.sun_path, sockname);
59 92
60 unlink (rxvt_connection::unix_sockname ()); 93 unlink (rxvt_connection::unix_sockname ());
… …
81void unix_listener::accept_cb (io_watcher &w, short revents) 114void unix_listener::accept_cb (io_watcher &w, short revents)
82{ 115{
83 int fd2 = accept (fd, 0, 0); 116 int fd2 = accept (fd, 0, 0);
84 117
85 if (fd2 >= 0) 118 if (fd2 >= 0)
119 {
120 fcntl (fd2, F_SETFD, FD_CLOEXEC);
86 new server (fd2); 121 new server (fd2);
122 }
123}
124
125int server::getfd (int remote_fd)
126{
127 send ("GETFD");
128 send (remote_fd);
129 return ptytty::recv_fd (fd);
87} 130}
88 131
89void server::log_msg (const char *msg) 132void server::log_msg (const char *msg)
90{ 133{
91 send ("MSG"), send (msg); 134 send ("MSG"), send (msg);
… …
100 va_list ap; 143 va_list ap;
101 va_start (ap, format); 144 va_start (ap, format);
102 vsnprintf (err, 1024, format, ap); 145 vsnprintf (err, 1024, format, ap);
103 va_end (ap); 146 va_end (ap);
104 147
105 send ("MSG"), send (err); 148 log_msg (err);
106 } 149 }
107 150
108 send ("END", 0); 151 send ("END"), send (0);
109 close (fd); 152 close (fd);
110 delete this; 153 delete this;
111} 154}
112 155
113void server::read_cb (io_watcher &w, short revents) 156void server::read_cb (io_watcher &w, short revents)
… …
118 { 161 {
119 if (!strcmp (tok, "NEW")) 162 if (!strcmp (tok, "NEW"))
120 { 163 {
121 stringvec *argv = new stringvec; 164 stringvec *argv = new stringvec;
122 stringvec *envv = new stringvec; 165 stringvec *envv = new stringvec;
123 166
124 for (;;) 167 for (;;)
125 { 168 {
126 if (!recv (tok)) 169 if (!recv (tok))
127 return err (); 170 return err ();
128 171
129 if (!strcmp (tok, "END")) 172 if (!strcmp (tok, "END"))
130 break; 173 break;
131 else if (!strcmp (tok, "ENV") && recv (tok)) 174 else if (!strcmp (tok, "ENV") && recv (tok))
132 envv->push_back (tok.get ()); 175 envv->push_back (strdup (tok));
133 else if (!strcmp (tok, "CWD") && recv (tok)) 176 else if (!strcmp (tok, "CWD") && recv (tok))
134 { 177 {
135 if (chdir (tok)) 178 if (chdir (tok))
179 {
180 delete envv;
181 delete argv;
136 err ("unable to change to working directory to '%s': %s", 182 return err ("unable to change to working directory to '%s', aborting: %s.\n",
137 (char *)tok, strerror (errno)); 183 (char *)tok, strerror (errno));
184 }
138 } 185 }
139 else if (!strcmp (tok, "ARG") && recv (tok)) 186 else if (!strcmp (tok, "ARG") && recv (tok))
140 argv->push_back (tok.get ()); 187 argv->push_back (strdup (tok));
141 else 188 else
142 return err ("protocol error: unexpected NEW token"); 189 return err ("protocol error: unexpected NEW token.\n");
143 } 190 }
144 191
145 envv->push_back (0); 192 envv->push_back (0);
146 193
147 { 194 {
148 char **old_environ = environ;
149 environ = envv->begin ();
150
151 rxvt_term *term = new rxvt_term; 195 rxvt_term *term = new rxvt_term;
152 196
153 term->log_hook = &log_cb; 197 term->log_hook = &log_cb;
154 term->argv = argv; 198 term->getfd_hook = &getfd_cb;
155 term->envv = envv;
156 199
157 bool success; 200 bool success;
158 201
159 try 202 try
160 { 203 {
161 success = term->init (argv->size (), argv->begin ()); 204 success = term->init (argv, envv);
162 } 205 }
163 catch (const class rxvt_failure_exception &e) 206 catch (const class rxvt_failure_exception &e)
164 { 207 {
165 success = false; 208 success = false;
166 } 209 }
167 210
168 environ = old_environ; 211 term->log_hook = 0;
212
213 chdir ("/");
169 214
170 if (!success) 215 if (!success)
171 term->destroy (); 216 term->destroy ();
172 217
173 send ("END"); send (success ? 1 : 0); 218 send ("END"); send (success ? 1 : 0);
174 } 219 }
175 } 220 }
176 else 221 else
177 return err ("protocol error: request '%s' unsupported.", (char *)tok); 222 return err ("protocol error: request '%s' unsupported.\n", (char *)tok);
178 } 223 }
179 else 224 else
180 return err (); 225 return err ();
181} 226}
182 227
228int opt_fork, opt_opendisplay, opt_quiet;
229
183int 230int
184main (int argc, const char *const *argv) 231main (int argc, const char *const *argv)
185{ 232{
186 rxvt_init_signals (); 233 rxvt_init ();
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
187 254
188 char *sockname = rxvt_connection::unix_sockname (); 255 char *sockname = rxvt_connection::unix_sockname ();
189 unix_listener l (sockname); 256 unix_listener l (sockname);
257
258 if (!opt_quiet)
259 {
190 printf ("rxvtd listening on %s.\n", sockname); 260 printf ("rxvt-unicode daemon listening on %s.\n", sockname);
261 fflush (stdout);
262 }
263
191 free (sockname); 264 free (sockname);
192 265
193 iom.loop (); 266 if (opt_fork)
267 {
268 pid_t pid = fork ();
194 269
195#if 0 270 if (pid < 0)
196 if (rxvt_init (argc, argv) == NULL) 271 {
272 rxvt_log ("unable to fork daemon, aborting.\n");
197 return EXIT_FAILURE; 273 return EXIT_FAILURE;
274 }
275 else if (pid > 0)
276 _exit (EXIT_SUCCESS);
277 }
198 278
199 dR; 279 io_manager::loop ();
200 rxvt_main_loop (aR); /* main processing loop */ 280
201#endif
202 return EXIT_SUCCESS; 281 return EXIT_SUCCESS;
203} 282}
204 283

Diff Legend

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