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.30 by root, Wed Aug 9 22:01:07 2006 UTC vs.
Revision 1.39 by root, Sat Nov 24 11:06:13 2007 UTC

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

Diff Legend

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