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.52 by root, Sun Oct 24 17:52:50 2010 UTC vs.
Revision 1.59 by sf-exg, Thu Jan 19 13:33:43 2012 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.
… …
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
… …
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{
230 ptytty::init (); 228 ptytty::init ();
231 229
232 int opt_fork, opt_opendisplay, opt_quiet; 230 static char opt_fork, opt_opendisplay, opt_quiet;
233#if ENABLE_MLOCK 231#if ENABLE_MLOCK
234 int opt_lock; 232 static char opt_lock;
235#endif 233#endif
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"))

Diff Legend

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