#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];
XCBConnSetupReq out;
- struct iovec parts[3];
+ struct iovec parts[6];
int count = 0;
int endian = 0x01020304;
int ret;
out.authorization_protocol_data_len = 0;
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;
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_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;
}
+ assert(count <= sizeof(parts) / sizeof(*parts));
pthread_mutex_lock(&c->iolock);
_xcb_out_write_block(c, parts, count);
ret = _xcb_out_flush(c);
pthread_mutex_unlock(&c->iolock);
- if(ret <= 0)
- return 0;
- return 1;
+ return ret;
}
static int read_setup(XCBConnection *c)
if(!c->setup)
return 0;
- if(_xcb_read_block(c->fd, c->setup, sizeof(XCBConnSetupGenericRep)) != sizeof(XCBConnSetupGenericRep))
+ if(_xcb_in_read_block(c, c->setup, sizeof(XCBConnSetupGenericRep)) != sizeof(XCBConnSetupGenericRep))
return 0;
{
c->setup = tmp;
}
- if(_xcb_read_block(c->fd, (char *) c->setup + sizeof(XCBConnSetupGenericRep), c->setup->length * 4) <= 0)
+ if(_xcb_in_read_block(c, (char *) c->setup + sizeof(XCBConnSetupGenericRep), c->setup->length * 4) <= 0)
return 0;
/* 0 = failed, 2 = authenticate, 1 = success */
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) &&
int _xcb_conn_wait(XCBConnection *c, const int should_write, pthread_cond_t *cond)
{
- int ret = 1;
+ int ret;
fd_set rfds, wfds;
-#if USE_THREAD_ASSERT
- static __thread int already_here = 0;
-
- assert(!already_here);
- ++already_here;
-#endif
-
- _xcb_assert_valid_sequence(c);
/* If the thing I should be doing is already being done, wait for it. */
if(should_write ? c->out.writing : c->in.reading)
{
pthread_cond_wait(cond, &c->iolock);
-#if USE_THREAD_ASSERT
- --already_here;
-#endif
return 1;
}
}
pthread_mutex_unlock(&c->iolock);
- ret = select(c->fd + 1, &rfds, &wfds, 0, 0);
+ ret = select(c->fd + 1, &rfds, &wfds, 0, 0) > 0;
pthread_mutex_lock(&c->iolock);
- if(ret <= 0) /* error: select failed */
- goto done;
-
- if(FD_ISSET(c->fd, &rfds))
- if((ret = _xcb_in_read(c)) <= 0)
- goto done;
+ if(ret)
+ {
+ if(FD_ISSET(c->fd, &rfds))
+ ret = ret && _xcb_in_read(c);
- if(FD_ISSET(c->fd, &wfds))
- if((ret = _xcb_out_write(c)) <= 0)
- goto done;
+ if(FD_ISSET(c->fd, &wfds))
+ ret = ret && _xcb_out_write(c, &c->out.vec, &c->out.vec_len);
+ }
-done:
if(should_write)
--c->out.writing;
--c->in.reading;
-#if USE_THREAD_ASSERT
- --already_here;
-#endif
return ret;
}