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

Diff Legend

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