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.31 by root, Fri Aug 18 23:03:31 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))
77 { 78 {
78 fputs ("socket name too long, aborting.\n", stderr); 79 fputs ("socket name too long, aborting.\n", stderr);
79 exit (EXIT_FAILURE); 80 exit (EXIT_FAILURE);
80 } 81 }
… …
84 perror ("unable to create listening socket"); 85 perror ("unable to create listening socket");
85 exit (EXIT_FAILURE); 86 exit (EXIT_FAILURE);
86 } 87 }
87 88
88 fcntl (fd, F_SETFD, FD_CLOEXEC); 89 fcntl (fd, F_SETFD, FD_CLOEXEC);
90 fcntl (fd, F_SETFL, O_NONBLOCK);
89 91
90 sa.sun_family = AF_UNIX; 92 sa.sun_family = AF_UNIX;
91 strcpy (sa.sun_path, sockname); 93 strcpy (sa.sun_path, sockname);
92 94
93 unlink (rxvt_connection::unix_sockname ()); 95 unlink (rxvt_connection::unix_sockname ());
… …
106 { 108 {
107 perror ("unable to listen on socket"); 109 perror ("unable to listen on socket");
108 exit (EXIT_FAILURE); 110 exit (EXIT_FAILURE);
109 } 111 }
110 112
111 accept_ev.start (fd, EVENT_READ); 113 accept_ev.start (fd, ev::READ);
112} 114}
113 115
114void unix_listener::accept_cb (io_watcher &w, short revents) 116void unix_listener::accept_cb (ev::io &w, int revents)
115{ 117{
116 int fd2 = accept (fd, 0, 0); 118 int fd2 = accept (fd, 0, 0);
117 119
118 if (fd2 >= 0) 120 if (fd2 >= 0)
119 {
120 fcntl (fd2, F_SETFD, FD_CLOEXEC);
121 new server (fd2); 121 new server (fd2);
122 }
123} 122}
124 123
125int server::getfd (int remote_fd) 124int server::getfd (int remote_fd)
126{ 125{
127 send ("GETFD"); 126 send ("GETFD");
… …
143 va_list ap; 142 va_list ap;
144 va_start (ap, format); 143 va_start (ap, format);
145 vsnprintf (err, 1024, format, ap); 144 vsnprintf (err, 1024, format, ap);
146 va_end (ap); 145 va_end (ap);
147 146
148 send ("MSG"), send (err); 147 log_msg (err);
149 } 148 }
150 149
151 send ("END"); send (0); 150 send ("END"), send (0);
152 close (fd); 151 close (fd);
153 delete this; 152 delete this;
154} 153}
155 154
156void server::read_cb (io_watcher &w, short revents) 155void server::read_cb (ev::io &w, int revents)
157{ 156{
158 auto_str tok; 157 auto_str tok;
159 158
160 if (recv (tok)) 159 if (recv (tok))
161 { 160 {
162 if (!strcmp (tok, "NEW")) 161 if (!strcmp (tok, "NEW"))
163 { 162 {
164 stringvec *argv = new stringvec; 163 stringvec *argv = new stringvec;
165 stringvec *envv = new stringvec; 164 stringvec *envv = new stringvec;
166 165
167 for (;;) 166 for (;;)
168 { 167 {
169 if (!recv (tok)) 168 if (!recv (tok))
170 return err (); 169 return err ();
171 170
… …
191 190
192 envv->push_back (0); 191 envv->push_back (0);
193 192
194 { 193 {
195 rxvt_term *term = new rxvt_term; 194 rxvt_term *term = new rxvt_term;
196 195
197 term->log_hook = &log_cb; 196 term->log_hook = &log_cb;
198 term->getfd_hook = &getfd_cb; 197 term->getfd_hook = &getfd_cb;
199 198
200 bool success; 199 bool success;
201 200
202 try 201 try
203 { 202 {
204 success = term->init (argv, envv); 203 success = term->init (argv, envv);
205 } 204 }
206 catch (const class rxvt_failure_exception &e) 205 catch (const class rxvt_failure_exception &e)
… …
244 { 243 {
245 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]);
246 return EXIT_FAILURE; 245 return EXIT_FAILURE;
247 } 246 }
248 } 247 }
249 248
250 chdir ("/"); 249 chdir ("/");
251 250
252 if (opt_opendisplay) 251 if (opt_opendisplay)
253 displays.get (getenv ("DISPLAY")); // open display and never release it 252 displays.get (getenv ("DISPLAY")); // open display and never release it
254 253
… …
272 rxvt_log ("unable to fork daemon, aborting.\n"); 271 rxvt_log ("unable to fork daemon, aborting.\n");
273 return EXIT_FAILURE; 272 return EXIT_FAILURE;
274 } 273 }
275 else if (pid > 0) 274 else if (pid > 0)
276 _exit (EXIT_SUCCESS); 275 _exit (EXIT_SUCCESS);
277 }
278 276
279 io_manager::loop (); 277 ev_default_fork ();
278 }
279
280 ev_loop (0);
280 281
281 return EXIT_SUCCESS; 282 return EXIT_SUCCESS;
282} 283}
283 284

Diff Legend

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