[Xcb] Fwd: [PATCH] xcb_open: Improve protocol/host parsing

[Jeremy Huddleston]

Begin forwarded message:

From: Jeremy Huddleston <jeremyhu at apple.com>
Date: May 12, 2010 19:57:29 PDT
To: "X.Org Development" <xorg-devel at lists.x.org>
Subject: [PATCH] xcb_open: Improve protocol/host parsing

Support scenarios where host is not set and protocol is.  eg:

DISPLAY=tcp/:0

Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

---

src/xcb_util.c |   28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/xcb_util.c b/src/xcb_util.c
index 3516186..c81859d 100644
--- a/src/xcb_util.c
+++ b/src/xcb_util.c
@@ -129,7 +129,7 @@ int xcb_parse_display(const char *name, char **host, int *displayp,
    return _xcb_parse_display(name, host, NULL, displayp, screenp);
}

-static int _xcb_open_tcp(char *host, char *protocol, const unsigned short port);
+static int _xcb_open_tcp(const char *host, char *protocol, const unsigned short port);
static int _xcb_open_unix(char *protocol, const char *file);
#ifdef DNETCONN
static int _xcb_open_decnet(const char *host, char *protocol, const unsigned short port);
@@ -138,7 +138,7 @@ static int _xcb_open_decnet(const char *host, char *protocol, const unsigned sho
static int _xcb_open_abstract(char *protocol, const char *file, size_t filelen);
#endif

-static int _xcb_open(char *host, char *protocol, const int display)
+static int _xcb_open(const char *host, char *protocol, const int display)
{
    int fd;
    static const char unix_base[] = "/tmp/.X11-unix/X";
@@ -147,14 +147,16 @@ static int _xcb_open(char *host, char *protocol, const int display)
    char *file = NULL;
    int actual_filelen;

-    if(*host)
-    {
#ifdef HAVE_LAUNCHD
        if(strncmp(host, "/tmp/launch", 11) == 0) {
-	    base = host;
-        } else {
+		base = host;
+		host = "";
+		protocol = NULL;
+        }
#endif

+    if(*host || protocol)
+    {
#ifdef DNETCONN
        /* DECnet displays have two colons, so _xcb_parse_display will have
           left one at the end.  However, an IPv6 address can end with *two*
@@ -175,9 +177,6 @@ static int _xcb_open(char *host, char *protocol, const int display)
                unsigned short port = X_TCP_PORT + display;
                return _xcb_open_tcp(host, protocol, port);
            }
-#ifdef HAVE_LAUNCHD
-        }
-#endif
    }

    filelen = strlen(base) + 1 + sizeof(display) * 3 + 1;
@@ -270,7 +269,7 @@ static int _xcb_open_decnet(const char *host, const char *protocol, const unsign
}
#endif

-static int _xcb_open_tcp(char *host, char *protocol, const unsigned short port)
+static int _xcb_open_tcp(const char *host, char *protocol, const unsigned short port)
{
    int fd = -1;
    struct addrinfo hints;
@@ -278,8 +277,15 @@ static int _xcb_open_tcp(char *host, char *protocol, const unsigned short port)
    struct addrinfo *results, *addr;
    char *bracket;

-    if (protocol && strcmp("tcp",protocol))
+    if (protocol && strcmp("tcp",protocol) && strcmp("inet",protocol)
+#ifdef AF_INET6
+	         && strcmp("inet6",protocol)
+#endif
+	)
        return -1;
+	
+    if (*host == '\0')
+	host = "localhost";

    memset(&hints, 0, sizeof(hints));
#ifdef AI_ADDRCONFIG
-- 
1.7.1


_______________________________________________
xorg-devel at lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel