… | |
… | |
19 | * along with this program; if not, write to the Free Software |
19 | * along with this program; if not, write to the Free Software |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
21 | *----------------------------------------------------------------------*/ |
21 | *----------------------------------------------------------------------*/ |
22 | |
22 | |
23 | #include "../config.h" |
23 | #include "../config.h" |
24 | #include <cstdio> |
24 | #include <stdio.h> |
25 | #include <cstdlib> |
25 | #include <stdlib.h> |
26 | #include <cstdarg> |
26 | #include <stdarg.h> |
27 | #include <cstring> |
27 | #include <string.h> |
28 | |
28 | |
29 | #include <unistd.h> |
29 | #include <unistd.h> |
30 | #include <fcntl.h> |
30 | #include <fcntl.h> |
31 | #include <sys/types.h> |
31 | #include <sys/types.h> |
32 | #include <sys/stat.h> |
32 | #include <sys/stat.h> |
… | |
… | |
39 | |
39 | |
40 | #if ENABLE_MLOCK |
40 | #if ENABLE_MLOCK |
41 | # include <sys/mman.h> |
41 | # include <sys/mman.h> |
42 | #endif |
42 | #endif |
43 | |
43 | |
44 | #include <cerrno> |
44 | #include <errno.h> |
45 | |
45 | |
46 | #include "rxvt.h" |
46 | #include "rxvt.h" |
47 | #include "rxvtdaemon.h" |
47 | #include "rxvtdaemon.h" |
48 | #include "libptytty.h" |
48 | #include "libptytty.h" |
49 | |
49 | |
… | |
… | |
226 | main (int argc, char *argv[]) |
226 | main (int argc, char *argv[]) |
227 | { |
227 | { |
228 | ptytty::init (); |
228 | ptytty::init (); |
229 | |
229 | |
230 | static char opt_fork, opt_opendisplay, opt_quiet; |
230 | static char opt_fork, opt_opendisplay, opt_quiet; |
|
|
231 | #if ENABLE_PERL |
|
|
232 | static char *opt_eval; |
|
|
233 | #endif |
231 | #if ENABLE_MLOCK |
234 | #if ENABLE_MLOCK |
232 | static char opt_lock; |
235 | static char opt_lock; |
233 | #endif |
236 | #endif |
234 | |
237 | |
235 | for (int i = 1; i < argc; i++) |
238 | for (int i = 1; i < argc; i++) |
… | |
… | |
242 | opt_quiet = 1; |
245 | opt_quiet = 1; |
243 | #if ENABLE_MLOCK |
246 | #if ENABLE_MLOCK |
244 | else if (!strcmp (argv [i], "-m") || !strcmp (argv [i], "--mlock")) |
247 | else if (!strcmp (argv [i], "-m") || !strcmp (argv [i], "--mlock")) |
245 | opt_lock = 1; |
248 | opt_lock = 1; |
246 | #endif |
249 | #endif |
|
|
250 | #if ENABLE_PERL |
|
|
251 | else if (!strcmp (argv [i], "-e") || !strcmp (argv [i], "--eval")) |
|
|
252 | opt_eval = argv [++i]; |
|
|
253 | #endif |
247 | else |
254 | else |
248 | { |
255 | { |
249 | rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]); |
256 | rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]); |
250 | return EXIT_FAILURE; |
257 | return EXIT_FAILURE; |
251 | } |
258 | } |
252 | } |
259 | } |
253 | |
260 | |
254 | rxvt_init (); |
261 | rxvt_init (); |
|
|
262 | |
|
|
263 | #if ENABLE_PERL |
|
|
264 | if (opt_eval) |
|
|
265 | { |
|
|
266 | rxvt_perl.init (); |
|
|
267 | rxvt_perl.eval (opt_eval); |
|
|
268 | } |
|
|
269 | #endif |
255 | |
270 | |
256 | // optionally open display and never release it. |
271 | // optionally open display and never release it. |
257 | if (opt_opendisplay) |
272 | if (opt_opendisplay) |
258 | if (const char *dpy = getenv ("DISPLAY")) |
273 | if (const char *dpy = getenv ("DISPLAY")) |
259 | displays.get (dpy ? dpy : ":0"); // move string logic into rxvt_display maybe? |
274 | displays.get (dpy ? dpy : ":0"); // move string logic into rxvt_display maybe? |