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.10 by pcg, Wed Mar 17 05:15:02 2004 UTC vs.
Revision 1.14 by pcg, Thu Apr 8 20:31:45 2004 UTC

1/*--------------------------------*-C-*---------------------------------*
2 * File: rxvtd.C
3 *----------------------------------------------------------------------*
4 *
5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
7 *
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
10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version.
12 *
13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details.
17 *
18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 *----------------------------------------------------------------------*/
22
1#include "../config.h" 23#include "../config.h"
2#include "rxvt.h" 24#include "rxvt.h"
3#include "rxvtdaemon.h" 25#include "rxvtdaemon.h"
4#include "iom.h" 26#include "iom.h"
5 27
7#include <cstdlib> 29#include <cstdlib>
8#include <cstdarg> 30#include <cstdarg>
9#include <cstring> 31#include <cstring>
10 32
11#include <unistd.h> 33#include <unistd.h>
34#include <fcntl.h>
12#include <sys/types.h> 35#include <sys/types.h>
13#include <sys/stat.h> 36#include <sys/stat.h>
14#include <sys/socket.h> 37#include <sys/socket.h>
15#include <sys/un.h> 38#include <sys/un.h>
16 39
44}; 67};
45 68
46unix_listener::unix_listener (const char *sockname) 69unix_listener::unix_listener (const char *sockname)
47: accept_ev (this, &unix_listener::accept_cb) 70: accept_ev (this, &unix_listener::accept_cb)
48{ 71{
49 if ((fd = socket (PF_LOCAL, SOCK_STREAM, 0)) < 0) 72 if ((fd = socket (PF_UNIX, SOCK_STREAM, 0)) < 0)
50 { 73 {
51 perror ("unable to create listening socket"); 74 perror ("unable to create listening socket");
52 exit (EXIT_FAILURE); 75 exit (EXIT_FAILURE);
53 } 76 }
54 77
78 fcntl (fd, F_SETFD, FD_CLOEXEC);
79
55 sockaddr_un sa; 80 sockaddr_un sa;
56 81
57 sa.sun_family = AF_UNIX; 82 sa.sun_family = AF_UNIX;
58 strcpy (sa.sun_path, sockname); 83 strcpy (sa.sun_path, sockname);
59 84
81void unix_listener::accept_cb (io_watcher &w, short revents) 106void unix_listener::accept_cb (io_watcher &w, short revents)
82{ 107{
83 int fd2 = accept (fd, 0, 0); 108 int fd2 = accept (fd, 0, 0);
84 109
85 if (fd2 >= 0) 110 if (fd2 >= 0)
111 {
112 fcntl (fd2, F_SETFD, FD_CLOEXEC);
86 new server (fd2); 113 new server (fd2);
114 }
87} 115}
88 116
89void server::log_msg (const char *msg) 117void server::log_msg (const char *msg)
90{ 118{
91 send ("MSG"), send (msg); 119 send ("MSG"), send (msg);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines