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