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

Diff Legend

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