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.30 by root, Wed Aug 9 22:01:07 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 rxvt_fatal ("socket name too long, aborting.\n");
78
49 if ((fd = socket (PF_LOCAL, SOCK_STREAM, 0)) < 0) 79 if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
50 { 80 {
51 perror ("unable to create listening socket"); 81 perror ("unable to create listening socket");
52 exit (EXIT_FAILURE); 82 exit (EXIT_FAILURE);
53 } 83 }
54 84
55 sockaddr_un sa; 85 fcntl (fd, F_SETFD, FD_CLOEXEC);
56 86
57 sa.sun_family = AF_UNIX; 87 sa.sun_family = AF_UNIX;
58 strcpy (sa.sun_path, sockname); 88 strcpy (sa.sun_path, sockname);
59 89
60 unlink (rxvt_connection::unix_sockname ()); 90 unlink (rxvt_connection::unix_sockname ());
… …
81void unix_listener::accept_cb (io_watcher &w, short revents) 111void unix_listener::accept_cb (io_watcher &w, short revents)
82{ 112{
83 int fd2 = accept (fd, 0, 0); 113 int fd2 = accept (fd, 0, 0);
84 114
85 if (fd2 >= 0) 115 if (fd2 >= 0)
116 {
117 fcntl (fd2, F_SETFD, FD_CLOEXEC);
86 new server (fd2); 118 new server (fd2);
119 }
120}
121
122int server::getfd (int remote_fd)
123{
124 send ("GETFD");
125 send (remote_fd);
126 return ptytty::recv_fd (fd);
87} 127}
88 128
89void server::log_msg (const char *msg) 129void server::log_msg (const char *msg)
90{ 130{
91 send ("MSG"), send (msg); 131 send ("MSG"), send (msg);
… …
127 return err (); 167 return err ();
128 168
129 if (!strcmp (tok, "END")) 169 if (!strcmp (tok, "END"))
130 break; 170 break;
131 else if (!strcmp (tok, "ENV") && recv (tok)) 171 else if (!strcmp (tok, "ENV") && recv (tok))
132 envv->push_back (tok.get ()); 172 envv->push_back (strdup (tok));
133 else if (!strcmp (tok, "CWD") && recv (tok)) 173 else if (!strcmp (tok, "CWD") && recv (tok))
134 { 174 {
135 if (chdir (tok)) 175 if (chdir (tok))
136 err ("unable to change to working directory to '%s': %s", 176 err ("unable to change to working directory to '%s': %s",
137 (char *)tok, strerror (errno)); 177 (char *)tok, strerror (errno));
138 } 178 }
139 else if (!strcmp (tok, "ARG") && recv (tok)) 179 else if (!strcmp (tok, "ARG") && recv (tok))
140 argv->push_back (tok.get ()); 180 argv->push_back (strdup (tok));
141 else 181 else
142 return err ("protocol error: unexpected NEW token"); 182 return err ("protocol error: unexpected NEW token");
143 } 183 }
144 184
145 envv->push_back (0); 185 envv->push_back (0);
146 186
147 { 187 {
148 char **old_environ = environ;
149 environ = envv->begin ();
150
151 rxvt_term *term = new rxvt_term; 188 rxvt_term *term = new rxvt_term;
152 189
153 term->log_hook = &log_cb; 190 term->log_hook = &log_cb;
154 term->argv = argv; 191 term->getfd_hook = &getfd_cb;
155 term->envv = envv;
156 192
157 bool success; 193 bool success;
158 194
159 try 195 try
160 { 196 {
161 success = term->init (argv->size (), argv->begin ()); 197 success = term->init (argv, envv);
162 } 198 }
163 catch (const class rxvt_failure_exception &e) 199 catch (const class rxvt_failure_exception &e)
164 { 200 {
165 success = false; 201 success = false;
166 } 202 }
167 203
168 environ = old_environ; 204 term->log_hook = 0;
205
206 chdir ("/");
169 207
170 if (!success) 208 if (!success)
171 term->destroy (); 209 term->destroy ();
172 210
173 send ("END"); send (success ? 1 : 0); 211 send ("END"); send (success ? 1 : 0);
… …
178 } 216 }
179 else 217 else
180 return err (); 218 return err ();
181} 219}
182 220
221int opt_fork, opt_opendisplay, opt_quiet;
222
183int 223int
184main (int argc, const char *const *argv) 224main (int argc, const char *const *argv)
185{ 225{
186 rxvt_init_signals (); 226 rxvt_init ();
227
228 for (int i = 1; i < argc; i++)
229 {
230 if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork"))
231 opt_fork = 1;
232 else if (!strcmp (argv [i], "-o") || !strcmp (argv [i], "--opendisplay"))
233 opt_opendisplay = 1;
234 else if (!strcmp (argv [i], "-q") || !strcmp (argv [i], "--quiet"))
235 opt_quiet = 1;
236 else
237 {
238 rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]);
239 return EXIT_FAILURE;
240 }
241 }
242
243 chdir ("/");
244
245 if (opt_opendisplay)
246 displays.get (getenv ("DISPLAY")); // open display and never release it
187 247
188 char *sockname = rxvt_connection::unix_sockname (); 248 char *sockname = rxvt_connection::unix_sockname ();
189 unix_listener l (sockname); 249 unix_listener l (sockname);
250
251 if (!opt_quiet)
252 {
190 printf ("rxvtd listening on %s.\n", sockname); 253 printf ("rxvt-unicode daemon listening on %s.\n", sockname);
254 fflush (stdout);
255 }
256
191 free (sockname); 257 free (sockname);
192 258
193 iom.loop (); 259 if (opt_fork)
260 {
261 pid_t pid = fork ();
194 262
195#if 0 263 if (pid < 0)
196 if (rxvt_init (argc, argv) == NULL) 264 {
265 rxvt_log ("unable to fork daemon, aborting.\n");
197 return EXIT_FAILURE; 266 return EXIT_FAILURE;
267 }
268 else if (pid > 0)
269 _exit (EXIT_SUCCESS);
270 }
198 271
199 dR; 272 io_manager::loop ();
200 rxvt_main_loop (aR); /* main processing loop */ 273
201#endif
202 return EXIT_SUCCESS; 274 return EXIT_SUCCESS;
203} 275}
204 276

Diff Legend

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