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.21 by root, Thu Jul 7 19:37:47 2005 UTC vs.
Revision 1.36 by root, Sat Nov 17 07:28:00 2007 UTC

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

Diff Legend

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