… | |
… | |
41 | # include <sys/mman.h> |
41 | # include <sys/mman.h> |
42 | #endif |
42 | #endif |
43 | |
43 | |
44 | #include <errno.h> |
44 | #include <errno.h> |
45 | |
45 | |
|
|
46 | #include <libptytty.h> |
|
|
47 | |
46 | #include "rxvt.h" |
48 | #include "rxvt.h" |
47 | #include "rxvtdaemon.h" |
49 | #include "rxvtdaemon.h" |
48 | #include "libptytty.h" |
|
|
49 | |
50 | |
50 | struct server : rxvt_connection { |
51 | struct server : rxvt_connection |
|
|
52 | { |
51 | log_callback log_cb; |
53 | log_callback log_cb; |
52 | getfd_callback getfd_cb; |
54 | getfd_callback getfd_cb; |
53 | |
55 | |
54 | void read_cb (ev::io &w, int revents); ev::io read_ev; |
56 | void read_cb (ev::io &w, int revents); ev::io read_ev; |
55 | void log_msg (const char *msg); |
57 | void log_msg (const char *msg); |
… | |
… | |
68 | } |
70 | } |
69 | |
71 | |
70 | void err (const char *format = 0, ...); |
72 | void err (const char *format = 0, ...); |
71 | }; |
73 | }; |
72 | |
74 | |
73 | struct unix_listener { |
75 | struct unix_listener |
|
|
76 | { |
74 | int fd; |
77 | int fd; |
75 | |
78 | |
76 | void accept_cb (ev::io &w, int revents); ev::io accept_ev; |
79 | void accept_cb (ev::io &w, int revents); ev::io accept_ev; |
77 | |
80 | |
78 | unix_listener (int fd); |
81 | unix_listener (int fd); |
… | |
… | |
203 | |
206 | |
204 | try |
207 | try |
205 | { |
208 | { |
206 | term->init (argv, envv); |
209 | term->init (argv, envv); |
207 | } |
210 | } |
208 | catch (const class rxvt_failure_exception &e) |
211 | catch (const std::exception &e) |
209 | { |
212 | { |
|
|
213 | log_msg (e.what()); |
210 | success = false; |
214 | success = false; |
211 | } |
215 | } |
212 | |
216 | |
213 | term->log_hook = 0; |
217 | term->log_hook = 0; |
214 | |
218 | |
… | |
… | |
272 | #endif |
276 | #endif |
273 | |
277 | |
274 | int |
278 | int |
275 | main (int argc, char *argv[]) |
279 | main (int argc, char *argv[]) |
276 | { |
280 | { |
|
|
281 | try |
|
|
282 | { |
277 | ptytty::init (); |
283 | ptytty::init (); |
|
|
284 | } |
|
|
285 | catch (const std::exception &e) |
|
|
286 | { |
|
|
287 | fputs (e.what (), stderr); |
|
|
288 | return EXIT_FAILURE; |
|
|
289 | } |
278 | |
290 | |
279 | static char opt_fork, opt_opendisplay, opt_quiet; |
291 | static char opt_fork, opt_opendisplay, opt_quiet; |
280 | #if ENABLE_PERL |
292 | #if ENABLE_PERL |
281 | static char *opt_eval; |
293 | static char *opt_eval; |
282 | #endif |
294 | #endif |