ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtd.C
(Generate patch)

Comparing rxvt-unicode/src/rxvtd.C (file contents):
Revision 1.51 by root, Sun Oct 24 17:34:47 2010 UTC vs.
Revision 1.58 by root, Sat Dec 17 23:17:33 2011 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtd.C 2 * File: rxvtd.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
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 {
… …
186 argv->push_back (strdup (tok)); 186 argv->push_back (strdup (tok));
187 else 187 else
188 return err ("protocol error: unexpected NEW token.\n"); 188 return err ("protocol error: unexpected NEW token.\n");
189 } 189 }
190 190
191 envv->push_back (0);
192
193 { 191 {
194 rxvt_term *term = new rxvt_term; 192 rxvt_term *term = new rxvt_term;
195 193
196 term->log_hook = &log_cb; 194 term->log_hook = &log_cb;
197 term->getfd_hook = &getfd_cb; 195 term->getfd_hook = &getfd_cb;
… …
223 else 221 else
224 return err (); 222 return err ();
225} 223}
226 224
227int 225int
228main (int argc, const char *const *argv) 226main (int argc, char *argv[])
229{ 227{
228 ptytty::init ();
229
230 int opt_fork, opt_opendisplay, opt_quiet; 230 static char opt_fork, opt_opendisplay, opt_quiet;
231#if ENABLE_MLOCK 231#if ENABLE_MLOCK
232 int opt_lock; 232 static char opt_lock;
233#endif 233#endif
234
235 rxvt_init ();
236 234
237 for (int i = 1; i < argc; i++) 235 for (int i = 1; i < argc; i++)
238 { 236 {
239 if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork")) 237 if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork"))
240 opt_fork = 1; 238 opt_fork = 1;
… …
251 rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]); 249 rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]);
252 return EXIT_FAILURE; 250 return EXIT_FAILURE;
253 } 251 }
254 } 252 }
255 253
254 rxvt_init ();
255
256 // optionally open display and never release it. 256 // optionally open display and never release it.
257 if (opt_opendisplay) 257 if (opt_opendisplay)
258 if (const char *dpy = getenv ("DISPLAY")) 258 if (const char *dpy = getenv ("DISPLAY"))
259 displays.get (dpy ? dpy : ":0"); // move string logic into rxvt_display maybe? 259 displays.get (dpy ? dpy : ":0"); // move string logic into rxvt_display maybe?
260 260

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines