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

Diff Legend

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