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

Diff Legend

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