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.25 by root, Tue Jan 17 15:43:49 2006 UTC

1/*--------------------------------*-C-*---------------------------------*
2 * File: rxvtd.C
3 *----------------------------------------------------------------------*
4 *
5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2003-2004 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" 24#include "rxvt.h"
3#include "rxvtdaemon.h" 25#include "rxvtdaemon.h"
26#include "fdpass.h"
4#include "iom.h" 27#include "iom.h"
5 28
6#include <cstdio> 29#include <cstdio>
7#include <cstdlib> 30#include <cstdlib>
8#include <cstdarg> 31#include <cstdarg>
9#include <cstring> 32#include <cstring>
10 33
11#include <unistd.h> 34#include <unistd.h>
35#include <fcntl.h>
12#include <sys/types.h> 36#include <sys/types.h>
13#include <sys/stat.h> 37#include <sys/stat.h>
14#include <sys/socket.h> 38#include <sys/socket.h>
15#include <sys/un.h> 39#include <sys/un.h>
16 40
… …
18 42
19extern char **environ; 43extern char **environ;
20 44
21struct server : rxvt_connection { 45struct server : rxvt_connection {
22 log_callback log_cb; 46 log_callback log_cb;
47 getfd_callback getfd_cb;
23 48
24 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;
25 void log_msg (const char *msg); 50 void log_msg (const char *msg);
51 int getfd (int remote_fd);
26 52
27 server (int fd) 53 server (int fd)
28 : read_ev (this, &server::read_cb), 54 : read_ev (this, &server::read_cb),
29 log_cb (this, &server::log_msg) 55 log_cb (this, &server::log_msg),
56 getfd_cb (this, &server::getfd)
30 { 57 {
31 this->fd = fd; 58 this->fd = fd;
32 read_ev.start (fd, EVENT_READ); 59 read_ev.start (fd, EVENT_READ);
33 } 60 }
34 61
… …
44}; 71};
45 72
46unix_listener::unix_listener (const char *sockname) 73unix_listener::unix_listener (const char *sockname)
47: accept_ev (this, &unix_listener::accept_cb) 74: accept_ev (this, &unix_listener::accept_cb)
48{ 75{
49 if ((fd = socket (PF_LOCAL, SOCK_STREAM, 0)) < 0) 76 if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
50 { 77 {
51 perror ("unable to create listening socket"); 78 perror ("unable to create listening socket");
52 exit (EXIT_FAILURE); 79 exit (EXIT_FAILURE);
53 } 80 }
54 81
82 fcntl (fd, F_SETFD, FD_CLOEXEC);
83
55 sockaddr_un sa; 84 sockaddr_un sa;
56 85
57 sa.sun_family = AF_UNIX; 86 sa.sun_family = AF_UNIX;
58 strcpy (sa.sun_path, sockname); 87 strcpy (sa.sun_path, sockname);
59 88
… …
81void unix_listener::accept_cb (io_watcher &w, short revents) 110void unix_listener::accept_cb (io_watcher &w, short revents)
82{ 111{
83 int fd2 = accept (fd, 0, 0); 112 int fd2 = accept (fd, 0, 0);
84 113
85 if (fd2 >= 0) 114 if (fd2 >= 0)
115 {
116 fcntl (fd2, F_SETFD, FD_CLOEXEC);
86 new server (fd2); 117 new server (fd2);
118 }
119}
120
121int server::getfd (int remote_fd)
122{
123 send ("GETFD");
124 send (remote_fd);
125 return rxvt_recv_fd (fd);
87} 126}
88 127
89void server::log_msg (const char *msg) 128void server::log_msg (const char *msg)
90{ 129{
91 send ("MSG"), send (msg); 130 send ("MSG"), send (msg);
… …
143 } 182 }
144 183
145 envv->push_back (0); 184 envv->push_back (0);
146 185
147 { 186 {
148 char **old_environ = environ;
149 environ = envv->begin ();
150
151 rxvt_term *term = new rxvt_term; 187 rxvt_term *term = new rxvt_term;
152 188
153 term->log_hook = &log_cb; 189 term->log_hook = &log_cb;
190 term->getfd_hook = &getfd_cb;
154 term->argv = argv; 191 term->argv = argv;
155 term->envv = envv; 192 term->envv = envv;
156 193
157 bool success; 194 bool success;
158 195
… …
163 catch (const class rxvt_failure_exception &e) 200 catch (const class rxvt_failure_exception &e)
164 { 201 {
165 success = false; 202 success = false;
166 } 203 }
167 204
168 environ = old_environ; 205 term->log_hook = 0;
206
207 chdir ("/");
169 208
170 if (!success) 209 if (!success)
171 term->destroy (); 210 term->destroy ();
172 211
173 send ("END"); send (success ? 1 : 0); 212 send ("END"); send (success ? 1 : 0);
… …
178 } 217 }
179 else 218 else
180 return err (); 219 return err ();
181} 220}
182 221
222int opt_fork, opt_opendisplay, opt_quiet;
223
183int 224int
184main (int argc, const char *const *argv) 225main (int argc, const char *const *argv)
185{ 226{
186 rxvt_init_signals (); 227 rxvt_init ();
228
229 for (int i = 1; i < argc; i++)
230 {
231 if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork"))
232 opt_fork = 1;
233 else if (!strcmp (argv [i], "-o") || !strcmp (argv [i], "--opendisplay"))
234 opt_opendisplay = 1;
235 else if (!strcmp (argv [i], "-q") || !strcmp (argv [i], "--quiet"))
236 opt_quiet = 1;
237 else
238 {
239 rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]);
240 return EXIT_FAILURE;
241 }
242 }
243
244 chdir ("/");
245
246 if (opt_opendisplay)
247 displays.get (getenv ("DISPLAY")); // open display and never release it
187 248
188 char *sockname = rxvt_connection::unix_sockname (); 249 char *sockname = rxvt_connection::unix_sockname ();
189 unix_listener l (sockname); 250 unix_listener l (sockname);
251
252 if (!opt_quiet)
253 {
190 printf ("rxvtd listening on %s.\n", sockname); 254 printf ("rxvt-unicode daemon listening on %s.\n", sockname);
255 fflush (stdout);
256 }
257
191 free (sockname); 258 free (sockname);
192 259
193 iom.loop (); 260 if (opt_fork)
261 {
262 pid_t pid = fork ();
194 263
195#if 0 264 if (pid < 0)
196 if (rxvt_init (argc, argv) == NULL) 265 {
266 rxvt_log ("unable to fork daemon, aborting.\n");
197 return EXIT_FAILURE; 267 return EXIT_FAILURE;
268 }
269 else if (pid > 0)
270 _exit (EXIT_SUCCESS);
271 }
198 272
199 dR; 273 io_manager::loop ();
200 rxvt_main_loop (aR); /* main processing loop */ 274
201#endif
202 return EXIT_SUCCESS; 275 return EXIT_SUCCESS;
203} 276}
204 277

Diff Legend

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