X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb_util.c;h=1625742b1a440bdbab8f868bfda6b928e9502d75;hb=d84dd752ef571491b015443fefedca53c7f81282;hp=463d085f66422a9ea6670dedd31488029ab14bc0;hpb=ff53285ae3f604e9f2cc5f4837255220459b5e44;p=free-sw%2Fxcb%2Flibxcb

diff --git a/src/xcb_util.c b/src/xcb_util.c
index 463d085..1625742 100644
--- a/src/xcb_util.c
+++ b/src/xcb_util.c
@@ -168,7 +168,11 @@ static int _xcb_open_abstract(char *protocol, const char *file, size_t filelen);
 static int _xcb_open(const char *host, char *protocol, const int display)
 {
     int fd;
+#ifdef __hpux
+    static const char unix_base[] = "/usr/spool/sockets/X11/";
+#else
     static const char unix_base[] = "/tmp/.X11-unix/X";
+#endif
     const char *base = unix_base;
     size_t filelen;
     char *file = NULL;
@@ -239,8 +243,8 @@ static int _xcb_open(const char *host, char *protocol, const int display)
     free(file);
 
     if (fd < 0 && !protocol && *host == '\0') {
-	    unsigned short port = X_TCP_PORT + display;
-	    fd = _xcb_open_tcp(host, protocol, port);
+            unsigned short port = X_TCP_PORT + display;
+            fd = _xcb_open_tcp(host, protocol, port);
     }
 
     return fd;
@@ -257,10 +261,10 @@ static int _xcb_socket(int family, int type, int proto)
     if (fd == -1 && errno == EINVAL)
 #endif
     {
-	fd = socket(family, type, proto);
+        fd = socket(family, type, proto);
 #ifndef _WIN32
-	if (fd >= 0)
-	    fcntl(fd, F_SETFD, FD_CLOEXEC);
+        if (fd >= 0)
+            fcntl(fd, F_SETFD, FD_CLOEXEC);
 #endif
     }
     return fd;
@@ -268,15 +272,15 @@ static int _xcb_socket(int family, int type, int proto)
 
 
 static int _xcb_do_connect(int fd, const struct sockaddr* addr, int addrlen) {
-	int on = 1;
+    int on = 1;
 
-	if(fd < 0)
-		return -1;
+    if(fd < 0)
+        return -1;
 
-	setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on));
-	setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof(on));
+    setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on));
+    setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof(on));
 
-	return connect(fd, addr, addrlen);
+    return connect(fd, addr, addrlen);
 }
 
 static int _xcb_open_tcp(const char *host, char *protocol, const unsigned short port)
@@ -291,13 +295,13 @@ static int _xcb_open_tcp(const char *host, char *protocol, const unsigned short
 
     if (protocol && strcmp("tcp",protocol) && strcmp("inet",protocol)
 #ifdef AF_INET6
-	         && strcmp("inet6",protocol)
+                 && strcmp("inet6",protocol)
 #endif
-	)
+        )
         return -1;
-	
+
     if (*host == '\0')
-	host = "localhost";
+        host = "localhost";
 
 #if HAVE_GETADDRINFO
     memset(&hints, 0, sizeof(hints));
@@ -430,7 +434,7 @@ xcb_connection_t *xcb_connect_to_display_with_auth_info(const char *displayname,
     xcb_connection_t *c;
 
     int parsed = _xcb_parse_display(displayname, &host, &protocol, &display, screenp);
-    
+
     if(!parsed) {
         c = _xcb_conn_ret_error(XCB_CONN_CLOSED_PARSE_ERR);
         goto out;