X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb_conn.c;h=5839ed816a7646caa76fbe7834537a9fa032fad0;hb=ff665b57266b9e7e9b9a366272c2115bbd516173;hp=15b5da6e45d866d6f81dd4dcb826adff60907aec;hpb=662479760c42fc38c458381ee3eaed92e2c8b733;p=free-sw%2Fxcb%2Flibxcb

diff --git a/src/xcb_conn.c b/src/xcb_conn.c
index 15b5da6..5839ed8 100644
--- a/src/xcb_conn.c
+++ b/src/xcb_conn.c
@@ -32,14 +32,29 @@
 #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;
@@ -57,22 +72,27 @@ static int write_setup(XCBConnection *c, XCBAuthInfo *auth_info)
     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)
@@ -82,7 +102,7 @@ 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;
 
     {
@@ -92,7 +112,7 @@ static int read_setup(XCBConnection *c)
         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 */
@@ -141,7 +161,7 @@ XCBConnection *XCBConnectToFD(int fd, XCBAuthInfo *auth_info)
     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) &&
@@ -180,11 +200,9 @@ void XCBDisconnect(XCBConnection *c)
 
 int _xcb_conn_wait(XCBConnection *c, const int should_write, pthread_cond_t *cond)
 {
-    int ret = 1;
+    int ret;
     fd_set rfds, wfds;
 
-    _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)
     {
@@ -204,24 +222,21 @@ int _xcb_conn_wait(XCBConnection *c, const int should_write, pthread_cond_t *con
     }
 
     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);
+    }
 
-done:
     if(should_write)
         --c->out.writing;
     --c->in.reading;
 
-    return ret > 0;
+    return ret;
 }