Attachment 316668 Details for Bug 456157 – abstract socket support

[patch] abstract socket support

libxcb-1.1.91-abstract-socket.patch (text/plain), 1.09 KB, created by Sami Farin on 2008-09-13 15:32:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sami Farin

Created: 2008-09-13 15:32:41 UTC

Size: 1.09 KB

patch

obsolete

>--- libxcb-1.1.91/src/xcb_util.c.bak	2008-07-13 14:42:41.000000000 +0300
>+++ libxcb-1.1.91/src/xcb_util.c	2008-09-13 17:25:17.743599656 +0300
>@@ -36,6 +36,7 @@
> #endif
> #include <netdb.h>
> #include <errno.h>
>+#include <stddef.h>
> #include <stdio.h>
> #include <stdlib.h>
> #include <unistd.h>
>@@ -251,14 +252,23 @@ static int _xcb_open_unix(char *protocol
>     if (protocol && strcmp("unix",protocol))
>         return -1;
> 
>+    fd = socket(AF_UNIX, SOCK_STREAM, 0);
>+    if(fd == -1)
>+        return -1;
>+
>+    memset(&addr, 0, sizeof(addr));
>+    addr.sun_family = AF_UNIX;
>+
>+    /* try the abstract socket first */
>+    strcpy(addr.sun_path + 1, file);
>+    if(connect(fd, (struct sockaddr *) &addr, strlen(file) + 1 + offsetof(struct sockaddr_un, sun_path)) != -1)
>+        return fd;
>+
>     strcpy(addr.sun_path, file);
>     addr.sun_family = AF_UNIX;
> #if HAVE_SOCKADDR_SUN_LEN
>     addr.sun_len = SUN_LEN(&addr);
> #endif
>-    fd = socket(AF_UNIX, SOCK_STREAM, 0);
>-    if(fd == -1)
>-        return -1;
>     if(connect(fd, (struct sockaddr *) &addr, sizeof(addr)) == -1)
>         return -1;
>     return fd;

Actions: View | Diff

Attachments on bug 456157: 316625 | 316668