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

Diff Legend

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