… | |
… | |
71 | }; |
71 | }; |
72 | |
72 | |
73 | unix_listener::unix_listener (const char *sockname) |
73 | unix_listener::unix_listener (const char *sockname) |
74 | : accept_ev (this, &unix_listener::accept_cb) |
74 | : accept_ev (this, &unix_listener::accept_cb) |
75 | { |
75 | { |
76 | if ((fd = socket (PF_UNIX, SOCK_STREAM, 0)) < 0) |
76 | if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0) |
77 | { |
77 | { |
78 | perror ("unable to create listening socket"); |
78 | perror ("unable to create listening socket"); |
79 | exit (EXIT_FAILURE); |
79 | exit (EXIT_FAILURE); |
80 | } |
80 | } |
81 | |
81 | |
… | |
… | |
118 | } |
118 | } |
119 | } |
119 | } |
120 | |
120 | |
121 | int server::getfd (int remote_fd) |
121 | int server::getfd (int remote_fd) |
122 | { |
122 | { |
123 | #if ENABLE_FRILLS && HAVE_UNIX_FDPASS |
|
|
124 | send ("GETFD"); |
123 | send ("GETFD"); |
125 | send (remote_fd); |
124 | send (remote_fd); |
126 | return rxvt_recv_fd (fd); |
125 | return rxvt_recv_fd (fd); |
127 | #else |
|
|
128 | return -1; |
|
|
129 | #endif |
|
|
130 | } |
126 | } |
131 | |
127 | |
132 | void server::log_msg (const char *msg) |
128 | void server::log_msg (const char *msg) |
133 | { |
129 | { |
134 | send ("MSG"), send (msg); |
130 | send ("MSG"), send (msg); |
… | |
… | |
170 | return err (); |
166 | return err (); |
171 | |
167 | |
172 | if (!strcmp (tok, "END")) |
168 | if (!strcmp (tok, "END")) |
173 | break; |
169 | break; |
174 | else if (!strcmp (tok, "ENV") && recv (tok)) |
170 | else if (!strcmp (tok, "ENV") && recv (tok)) |
175 | envv->push_back (tok.get ()); |
171 | envv->push_back (strdup (tok)); |
176 | else if (!strcmp (tok, "CWD") && recv (tok)) |
172 | else if (!strcmp (tok, "CWD") && recv (tok)) |
177 | { |
173 | { |
178 | if (chdir (tok)) |
174 | if (chdir (tok)) |
179 | err ("unable to change to working directory to '%s': %s", |
175 | err ("unable to change to working directory to '%s': %s", |
180 | (char *)tok, strerror (errno)); |
176 | (char *)tok, strerror (errno)); |
181 | } |
177 | } |
182 | else if (!strcmp (tok, "ARG") && recv (tok)) |
178 | else if (!strcmp (tok, "ARG") && recv (tok)) |
183 | argv->push_back (tok.get ()); |
179 | argv->push_back (strdup (tok)); |
184 | else |
180 | else |
185 | return err ("protocol error: unexpected NEW token"); |
181 | return err ("protocol error: unexpected NEW token"); |
186 | } |
182 | } |
187 | |
183 | |
188 | envv->push_back (0); |
184 | envv->push_back (0); |
189 | |
185 | |
190 | { |
186 | { |
191 | char **old_environ = environ; |
|
|
192 | environ = envv->begin (); |
|
|
193 | |
|
|
194 | rxvt_term *term = new rxvt_term; |
187 | rxvt_term *term = new rxvt_term; |
195 | |
188 | |
196 | term->log_hook = &log_cb; |
189 | term->log_hook = &log_cb; |
197 | term->getfd_hook = &getfd_cb; |
190 | term->getfd_hook = &getfd_cb; |
198 | term->argv = argv; |
|
|
199 | term->envv = envv; |
|
|
200 | |
191 | |
201 | bool success; |
192 | bool success; |
202 | |
193 | |
203 | try |
194 | try |
204 | { |
195 | { |
205 | success = term->init (argv->size (), argv->begin ()); |
196 | success = term->init (argv, envv); |
206 | } |
197 | } |
207 | catch (const class rxvt_failure_exception &e) |
198 | catch (const class rxvt_failure_exception &e) |
208 | { |
199 | { |
209 | success = false; |
200 | success = false; |
210 | } |
201 | } |
211 | |
202 | |
212 | term->log_hook = 0; |
203 | term->log_hook = 0; |
213 | |
204 | |
214 | environ = old_environ; |
|
|
215 | chdir ("/"); |
205 | chdir ("/"); |
216 | |
206 | |
217 | if (!success) |
207 | if (!success) |
218 | term->destroy (); |
208 | term->destroy (); |
219 | |
209 | |
… | |
… | |
230 | int opt_fork, opt_opendisplay, opt_quiet; |
220 | int opt_fork, opt_opendisplay, opt_quiet; |
231 | |
221 | |
232 | int |
222 | int |
233 | main (int argc, const char *const *argv) |
223 | main (int argc, const char *const *argv) |
234 | { |
224 | { |
|
|
225 | rxvt_init (); |
|
|
226 | |
235 | for (int i = 1; i < argc; i++) |
227 | for (int i = 1; i < argc; i++) |
236 | { |
228 | { |
237 | if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork")) |
229 | if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork")) |
238 | opt_fork = 1; |
230 | opt_fork = 1; |
239 | else if (!strcmp (argv [i], "-o") || !strcmp (argv [i], "--opendisplay")) |
231 | else if (!strcmp (argv [i], "-o") || !strcmp (argv [i], "--opendisplay")) |
… | |
… | |
245 | rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]); |
237 | rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]); |
246 | return EXIT_FAILURE; |
238 | return EXIT_FAILURE; |
247 | } |
239 | } |
248 | } |
240 | } |
249 | |
241 | |
250 | rxvt_init (); |
|
|
251 | |
|
|
252 | chdir ("/"); |
242 | chdir ("/"); |
253 | |
243 | |
254 | if (opt_opendisplay) |
244 | if (opt_opendisplay) |
255 | displays.get (getenv ("DISPLAY")); // open display and never release it |
245 | displays.get (getenv ("DISPLAY")); // open display and never release it |
256 | |
246 | |