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

Diff Legend

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