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.26 by root, Sun Jan 22 00:36:59 2006 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 "fdpass.h"
27#include "iom.h"
28
29#include <cstdio> 24#include <cstdio>
30#include <cstdlib> 25#include <cstdlib>
31#include <cstdarg> 26#include <cstdarg>
32#include <cstring> 27#include <cstring>
33 28
… …
38#include <sys/socket.h> 33#include <sys/socket.h>
39#include <sys/un.h> 34#include <sys/un.h>
40 35
41#include <cerrno> 36#include <cerrno>
42 37
43extern char **environ; 38#include "rxvt.h"
39#include "rxvtdaemon.h"
40#include "libptytty.h"
44 41
45struct server : rxvt_connection { 42struct server : rxvt_connection {
46 log_callback log_cb; 43 log_callback log_cb;
47 getfd_callback getfd_cb; 44 getfd_callback getfd_cb;
48 45
49 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;
50 void log_msg (const char *msg); 47 void log_msg (const char *msg);
51 int getfd (int remote_fd); 48 int getfd (int remote_fd);
52 49
53 server (int fd) 50 server (int fd)
54 : read_ev (this, &server::read_cb), 51 : read_ev (this, &server::read_cb),
55 log_cb (this, &server::log_msg), 52 log_cb (this, &server::log_msg),
56 getfd_cb (this, &server::getfd) 53 getfd_cb (this, &server::getfd)
57 { 54 {
58 this->fd = fd; 55 fcntl (fd, F_SETFD, FD_CLOEXEC);
56 fcntl (fd, F_SETFL, 0);
59 read_ev.start (fd, EVENT_READ); 57 read_ev.start (fd, ev::READ);
60 } 58 }
61 59
62 void err (const char *format = 0, ...); 60 void err (const char *format = 0, ...);
63}; 61};
64 62
65struct unix_listener { 63struct unix_listener {
66 int fd; 64 int fd;
67 65
68 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;
69 67
70 unix_listener (const char *sockname); 68 unix_listener (const char *sockname);
71}; 69};
72 70
73unix_listener::unix_listener (const char *sockname) 71unix_listener::unix_listener (const char *sockname)
74: accept_ev (this, &unix_listener::accept_cb) 72: accept_ev (this, &unix_listener::accept_cb)
75{ 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
76 if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0) 82 if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
77 { 83 {
78 perror ("unable to create listening socket"); 84 perror ("unable to create listening socket");
79 exit (EXIT_FAILURE); 85 exit (EXIT_FAILURE);
80 } 86 }
81 87
82 fcntl (fd, F_SETFD, FD_CLOEXEC); 88 fcntl (fd, F_SETFD, FD_CLOEXEC);
83 89 fcntl (fd, F_SETFL, O_NONBLOCK);
84 sockaddr_un sa;
85 90
86 sa.sun_family = AF_UNIX; 91 sa.sun_family = AF_UNIX;
87 strcpy (sa.sun_path, sockname); 92 strcpy (sa.sun_path, sockname);
88 93
89 unlink (rxvt_connection::unix_sockname ()); 94 unlink (rxvt_connection::unix_sockname ());
… …
102 { 107 {
103 perror ("unable to listen on socket"); 108 perror ("unable to listen on socket");
104 exit (EXIT_FAILURE); 109 exit (EXIT_FAILURE);
105 } 110 }
106 111
107 accept_ev.start (fd, EVENT_READ); 112 accept_ev.start (fd, ev::READ);
108} 113}
109 114
110void unix_listener::accept_cb (io_watcher &w, short revents) 115void unix_listener::accept_cb (ev::io &w, int revents)
111{ 116{
112 int fd2 = accept (fd, 0, 0); 117 int fd2 = accept (fd, 0, 0);
113 118
114 if (fd2 >= 0) 119 if (fd2 >= 0)
115 {
116 fcntl (fd2, F_SETFD, FD_CLOEXEC);
117 new server (fd2); 120 new server (fd2);
118 }
119} 121}
120 122
121int server::getfd (int remote_fd) 123int server::getfd (int remote_fd)
122{ 124{
123 send ("GETFD"); 125 send ("GETFD");
124 send (remote_fd); 126 send (remote_fd);
125 return rxvt_recv_fd (fd); 127 return ptytty::recv_fd (fd);
126} 128}
127 129
128void server::log_msg (const char *msg) 130void server::log_msg (const char *msg)
129{ 131{
130 send ("MSG"), send (msg); 132 send ("MSG"), send (msg);
… …
139 va_list ap; 141 va_list ap;
140 va_start (ap, format); 142 va_start (ap, format);
141 vsnprintf (err, 1024, format, ap); 143 vsnprintf (err, 1024, format, ap);
142 va_end (ap); 144 va_end (ap);
143 145
144 send ("MSG"), send (err); 146 log_msg (err);
145 } 147 }
146 148
147 send ("END", 0); 149 send ("END"), send (0);
148 close (fd); 150 close (fd);
149 delete this; 151 delete this;
150} 152}
151 153
152void server::read_cb (io_watcher &w, short revents) 154void server::read_cb (ev::io &w, int revents)
153{ 155{
154 auto_str tok; 156 auto_str tok;
155 157
156 if (recv (tok)) 158 if (recv (tok))
157 { 159 {
158 if (!strcmp (tok, "NEW")) 160 if (!strcmp (tok, "NEW"))
159 { 161 {
160 stringvec *argv = new stringvec; 162 stringvec *argv = new stringvec;
161 stringvec *envv = new stringvec; 163 stringvec *envv = new stringvec;
162 164
163 for (;;) 165 for (;;)
164 { 166 {
165 if (!recv (tok)) 167 if (!recv (tok))
166 return err (); 168 return err ();
167 169
… …
170 else if (!strcmp (tok, "ENV") && recv (tok)) 172 else if (!strcmp (tok, "ENV") && recv (tok))
171 envv->push_back (strdup (tok)); 173 envv->push_back (strdup (tok));
172 else if (!strcmp (tok, "CWD") && recv (tok)) 174 else if (!strcmp (tok, "CWD") && recv (tok))
173 { 175 {
174 if (chdir (tok)) 176 if (chdir (tok))
177 {
178 delete envv;
179 delete argv;
175 err ("unable to change to working directory to '%s': %s", 180 return err ("unable to change to working directory to '%s', aborting: %s.\n",
176 (char *)tok, strerror (errno)); 181 (char *)tok, strerror (errno));
182 }
177 } 183 }
178 else if (!strcmp (tok, "ARG") && recv (tok)) 184 else if (!strcmp (tok, "ARG") && recv (tok))
179 argv->push_back (strdup (tok)); 185 argv->push_back (strdup (tok));
180 else 186 else
181 return err ("protocol error: unexpected NEW token"); 187 return err ("protocol error: unexpected NEW token.\n");
182 } 188 }
183 189
184 envv->push_back (0); 190 envv->push_back (0);
185 191
186 { 192 {
187 rxvt_term *term = new rxvt_term; 193 rxvt_term *term = new rxvt_term;
188 194
189 term->log_hook = &log_cb; 195 term->log_hook = &log_cb;
190 term->getfd_hook = &getfd_cb; 196 term->getfd_hook = &getfd_cb;
191 197
192 bool success; 198 bool success;
193 199
194 try 200 try
195 { 201 {
196 success = term->init (argv, envv); 202 success = term->init (argv, envv);
197 } 203 }
198 catch (const class rxvt_failure_exception &e) 204 catch (const class rxvt_failure_exception &e)
… …
209 215
210 send ("END"); send (success ? 1 : 0); 216 send ("END"); send (success ? 1 : 0);
211 } 217 }
212 } 218 }
213 else 219 else
214 return err ("protocol error: request '%s' unsupported.", (char *)tok); 220 return err ("protocol error: request '%s' unsupported.\n", (char *)tok);
215 } 221 }
216 else 222 else
217 return err (); 223 return err ();
218} 224}
219 225
… …
236 { 242 {
237 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]);
238 return EXIT_FAILURE; 244 return EXIT_FAILURE;
239 } 245 }
240 } 246 }
241 247
242 chdir ("/"); 248 chdir ("/");
243 249
244 if (opt_opendisplay) 250 if (opt_opendisplay)
245 displays.get (getenv ("DISPLAY")); // open display and never release it 251 displays.get (getenv ("DISPLAY")); // open display and never release it
246 252
… …
266 } 272 }
267 else if (pid > 0) 273 else if (pid > 0)
268 _exit (EXIT_SUCCESS); 274 _exit (EXIT_SUCCESS);
269 } 275 }
270 276
271 io_manager::loop (); 277 ev::ev_loop (0);
272 278
273 return EXIT_SUCCESS; 279 return EXIT_SUCCESS;
274} 280}
275 281

Diff Legend

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