frederik
/
libxcb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Open the X11 socket with close-on-exec flag 

This saves the X11 connection from leaking into children processes.
On Linux, this is fully thread-safe using SOCK_CLOEXEC. On other
systems, there is a small race condition.

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Rémi Denis-Courmont 2010-02-13 12:23:51 +02:00 committed by Julien Danjou
parent 367882fa32
commit 53a9834e4c
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/xcb_util.c
View File

@ -41,6 +41,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stddef.h> #include <stddef.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h>
#include <string.h> #include <string.h>
#include "xcb.h" #include "xcb.h"
@ -177,6 +178,22 @@ static int _xcb_open(char *host, char *protocol, const int display)
return _xcb_open_unix(protocol, file); return _xcb_open_unix(protocol, file);
} }
static int _xcb_socket(int family, int type, int proto)
{
int fd;
#ifdef SOCK_CLOEXEC
fd = socket(family, type | SOCK_CLOEXEC, proto);
if (fd == -1 && errno == EINVAL)
#endif
{
fd = socket(family, type, proto);
if (fd >= 0)
fcntl(fd, F_SETFD, FD_CLOEXEC);
}
return fd;
}
#ifdef DNETCONN #ifdef DNETCONN
static int _xcb_open_decnet(const char *host, const char *protocol, const unsigned short port) static int _xcb_open_decnet(const char *host, const char *protocol, const unsigned short port)
{ {
@ -199,7 +216,7 @@ static int _xcb_open_decnet(const char *host, const char *protocol, const unsign
return -1; return -1;
addr.sdn_objnum = 0; addr.sdn_objnum = 0;
fd = socket(PF_DECnet, SOCK_STREAM, 0); fd = _xcb_socket(PF_DECnet, SOCK_STREAM, 0);
if(fd == -1) if(fd == -1)
return -1; return -1;
@ -256,7 +273,7 @@ static int _xcb_open_tcp(char *host, char *protocol, const unsigned short port)
for(addr = results; addr; addr = addr->ai_next) for(addr = results; addr; addr = addr->ai_next)
{ {
fd = socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol); fd = _xcb_socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol);
if(fd >= 0) { if(fd >= 0) {
int on = 1; int on = 1;
setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on)); setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on));
@ -285,7 +302,7 @@ static int _xcb_open_unix(char *protocol, const char *file)
#ifdef HAVE_SOCKADDR_SUN_LEN #ifdef HAVE_SOCKADDR_SUN_LEN
addr.sun_len = SUN_LEN(&addr); addr.sun_len = SUN_LEN(&addr);
#endif #endif
fd = socket(AF_UNIX, SOCK_STREAM, 0); fd = _xcb_socket(AF_UNIX, SOCK_STREAM, 0);
if(fd == -1) if(fd == -1)
return -1; return -1;
if(connect(fd, (struct sockaddr *) &addr, sizeof(addr)) == -1) { if(connect(fd, (struct sockaddr *) &addr, sizeof(addr)) == -1) {
@ -311,7 +328,7 @@ static int _xcb_open_abstract(char *protocol, const char *file, size_t filelen)
#ifdef HAVE_SOCKADDR_SUN_LEN #ifdef HAVE_SOCKADDR_SUN_LEN
addr.sun_len = 1 + filelen; addr.sun_len = 1 + filelen;
#endif #endif
fd = socket(AF_UNIX, SOCK_STREAM, 0); fd = _xcb_socket(AF_UNIX, SOCK_STREAM, 0);
if (fd == -1) if (fd == -1)
return -1; return -1;
if (connect(fd, (struct sockaddr *) &addr, namelen) == -1) { if (connect(fd, (struct sockaddr *) &addr, namelen) == -1) {