#include <stdlib.h>
#include <netinet/in.h>
#include <sys/select.h>
+#include <sys/fcntl.h>
#include "xcb.h"
#include "xcbint.h"
+static int set_fd_flags(const int fd)
+{
+ long flags = fcntl(fd, F_GETFL, 0);
+ if(flags == -1)
+ return 0;
+ flags |= O_NONBLOCK;
+ if(fcntl(fd, F_SETFL, flags) == -1)
+ return 0;
+ if(fcntl(fd, F_SETFD, FD_CLOEXEC) == -1)
+ return 0;
+ return 1;
+}
+
static int write_setup(XCBConnection *c, XCBAuthInfo *auth_info)
{
static const char pad[3];
parts[count].iov_len = sizeof(XCBConnSetupReq);
parts[count++].iov_base = &out;
parts[count].iov_len = XCB_PAD(sizeof(XCBConnSetupReq));
- parts[count++].iov_base = (caddr_t) pad;
+ parts[count++].iov_base = (char *) pad;
if(auth_info)
{
parts[count].iov_len = out.authorization_protocol_name_len = auth_info->namelen;
parts[count++].iov_base = auth_info->name;
parts[count].iov_len = XCB_PAD(out.authorization_protocol_name_len);
- parts[count++].iov_base = (caddr_t) pad;
+ parts[count++].iov_base = (char *) pad;
parts[count].iov_len = out.authorization_protocol_data_len = auth_info->datalen;
parts[count++].iov_base = auth_info->data;
parts[count].iov_len = XCB_PAD(out.authorization_protocol_data_len);
- parts[count++].iov_base = (caddr_t) pad;
+ parts[count++].iov_base = (char *) pad;
}
assert(count <= sizeof(parts) / sizeof(*parts));
c->fd = fd;
if(!(
- _xcb_set_fd_flags(fd) &&
+ set_fd_flags(fd) &&
pthread_mutex_init(&c->iolock, 0) == 0 &&
_xcb_in_init(&c->in) &&
_xcb_out_init(&c->out) &&