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.26 by root, Sun Jan 22 00:36:59 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);
… …
127 return err (); 166 return err ();
128 167
129 if (!strcmp (tok, "END")) 168 if (!strcmp (tok, "END"))
130 break; 169 break;
131 else if (!strcmp (tok, "ENV") && recv (tok)) 170 else if (!strcmp (tok, "ENV") && recv (tok))
132 envv->push_back (tok.get ()); 171 envv->push_back (strdup (tok));
133 else if (!strcmp (tok, "CWD") && recv (tok)) 172 else if (!strcmp (tok, "CWD") && recv (tok))
134 { 173 {
135 if (chdir (tok)) 174 if (chdir (tok))
136 err ("unable to change to working directory to '%s': %s", 175 err ("unable to change to working directory to '%s': %s",
137 (char *)tok, strerror (errno)); 176 (char *)tok, strerror (errno));
138 } 177 }
139 else if (!strcmp (tok, "ARG") && recv (tok)) 178 else if (!strcmp (tok, "ARG") && recv (tok))
140 argv->push_back (tok.get ()); 179 argv->push_back (strdup (tok));
141 else 180 else
142 return err ("protocol error: unexpected NEW token"); 181 return err ("protocol error: unexpected NEW token");
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;
154 term->argv = argv; 190 term->getfd_hook = &getfd_cb;
155 term->envv = envv;
156 191
157 bool success; 192 bool success;
158 193
159 try 194 try
160 { 195 {
161 success = term->init (argv->size (), argv->begin ()); 196 success = term->init (argv, envv);
162 } 197 }
163 catch (const class rxvt_failure_exception &e) 198 catch (const class rxvt_failure_exception &e)
164 { 199 {
165 success = false; 200 success = false;
166 } 201 }
167 202
168 environ = old_environ; 203 term->log_hook = 0;
204
205 chdir ("/");
169 206
170 if (!success) 207 if (!success)
171 term->destroy (); 208 term->destroy ();
172 209
173 send ("END"); send (success ? 1 : 0); 210 send ("END"); send (success ? 1 : 0);
… …
178 } 215 }
179 else 216 else
180 return err (); 217 return err ();
181} 218}
182 219
220int opt_fork, opt_opendisplay, opt_quiet;
221
183int 222int
184main (int argc, const char *const *argv) 223main (int argc, const char *const *argv)
185{ 224{
186 rxvt_init_signals (); 225 rxvt_init ();
226
227 for (int i = 1; i < argc; i++)
228 {
229 if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork"))
230 opt_fork = 1;
231 else if (!strcmp (argv [i], "-o") || !strcmp (argv [i], "--opendisplay"))
232 opt_opendisplay = 1;
233 else if (!strcmp (argv [i], "-q") || !strcmp (argv [i], "--quiet"))
234 opt_quiet = 1;
235 else
236 {
237 rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]);
238 return EXIT_FAILURE;
239 }
240 }
241
242 chdir ("/");
243
244 if (opt_opendisplay)
245 displays.get (getenv ("DISPLAY")); // open display and never release it
187 246
188 char *sockname = rxvt_connection::unix_sockname (); 247 char *sockname = rxvt_connection::unix_sockname ();
189 unix_listener l (sockname); 248 unix_listener l (sockname);
249
250 if (!opt_quiet)
251 {
190 printf ("rxvtd listening on %s.\n", sockname); 252 printf ("rxvt-unicode daemon listening on %s.\n", sockname);
253 fflush (stdout);
254 }
255
191 free (sockname); 256 free (sockname);
192 257
193 iom.loop (); 258 if (opt_fork)
259 {
260 pid_t pid = fork ();
194 261
195#if 0 262 if (pid < 0)
196 if (rxvt_init (argc, argv) == NULL) 263 {
264 rxvt_log ("unable to fork daemon, aborting.\n");
197 return EXIT_FAILURE; 265 return EXIT_FAILURE;
266 }
267 else if (pid > 0)
268 _exit (EXIT_SUCCESS);
269 }
198 270
199 dR; 271 io_manager::loop ();
200 rxvt_main_loop (aR); /* main processing loop */ 272
201#endif
202 return EXIT_SUCCESS; 273 return EXIT_SUCCESS;
203} 274}
204 275

Diff Legend

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