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

Diff Legend

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