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.9 by pcg, Fri Feb 13 13:28:17 2004 UTC vs.
Revision 1.35 by root, Sat Nov 17 07:26:54 2007 UTC

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

Diff Legend

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