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

Diff Legend

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