… | |
… | |
100 | fcntl (fd, F_SETFL, O_NONBLOCK); |
100 | fcntl (fd, F_SETFL, O_NONBLOCK); |
101 | |
101 | |
102 | sa.sun_family = AF_UNIX; |
102 | sa.sun_family = AF_UNIX; |
103 | strcpy (sa.sun_path, sockname); |
103 | strcpy (sa.sun_path, sockname); |
104 | |
104 | |
105 | unlink (rxvt_connection::unix_sockname ()); |
105 | unlink (sockname); |
106 | |
106 | |
107 | mode_t omask = umask (0077); |
107 | mode_t omask = umask (0077); |
108 | |
108 | |
109 | if (bind (fd, (sockaddr *)&sa, sizeof (sa))) |
109 | if (bind (fd, (sockaddr *)&sa, sizeof (sa))) |
110 | { |
110 | { |
… | |
… | |
225 | } |
225 | } |
226 | |
226 | |
227 | int |
227 | int |
228 | main (int argc, const char *const *argv) |
228 | main (int argc, const char *const *argv) |
229 | { |
229 | { |
|
|
230 | ptytty::init (); |
|
|
231 | |
230 | int opt_fork, opt_opendisplay, opt_quiet; |
232 | static char opt_fork, opt_opendisplay, opt_quiet; |
231 | #if ENABLE_MLOCK |
233 | #if ENABLE_MLOCK |
232 | int opt_lock; |
234 | static char opt_lock; |
233 | #endif |
235 | #endif |
234 | |
|
|
235 | rxvt_init (); |
|
|
236 | |
236 | |
237 | for (int i = 1; i < argc; i++) |
237 | for (int i = 1; i < argc; i++) |
238 | { |
238 | { |
239 | if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork")) |
239 | if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork")) |
240 | opt_fork = 1; |
240 | opt_fork = 1; |
… | |
… | |
251 | rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]); |
251 | rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]); |
252 | return EXIT_FAILURE; |
252 | return EXIT_FAILURE; |
253 | } |
253 | } |
254 | } |
254 | } |
255 | |
255 | |
|
|
256 | rxvt_init (); |
|
|
257 | |
256 | // optionally open display and never release it. |
258 | // optionally open display and never release it. |
257 | if (opt_opendisplay) |
259 | if (opt_opendisplay) |
258 | if (const char *dpy = getenv ("DISPLAY")) |
260 | if (const char *dpy = getenv ("DISPLAY")) |
259 | displays.get (dpy ? dpy : ":0"); // move string logic into rxvt_display maybe? |
261 | displays.get (dpy ? dpy : ":0"); // move string logic into rxvt_display maybe? |
260 | |
262 | |