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.1 by pcg, Mon Nov 24 17:28:08 2003 UTC vs.
Revision 1.37 by root, Sun Nov 18 00:17:20 2007 UTC

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

Diff Legend

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