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.26 by root, Sun Jan 22 00:36:59 2006 UTC

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

Diff Legend

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