fdo-mirrors/xorg-libxcb
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/lib/libxcb.git synced 2026-04-03 10:20:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

xcb_util.c: don't build Unix domain socket path code on Windows

Browse source 
Fixes build failure and compiler warnings:

xcb_util.c: In function '_xcb_parse_display_path_to_socket':
xcb_util.c:109:46: error: invalid use of undefined type 'struct sockaddr_un'
  109 |     char path[sizeof(((struct sockaddr_un*)0)->sun_path) + 1 + 10];
      |                                              ^~
xcb_util.c: In function '_xcb_open':
xcb_util.c:256:11: warning: unused variable 'file' [-Wunused-variable]
  256 |     char *file = NULL;
      |           ^~~~
xcb_util.c:255:12: warning: unused variable 'filelen' [-Wunused-variable]
  255 |     size_t filelen;
      |            ^~~~~~~
xcb_util.c:254:17: warning: unused variable 'base' [-Wunused-variable]
  254 |     const char *base = unix_base;
      |                 ^~~~
xcb_util.c:248:9: warning: unused variable 'fd' [-Wunused-variable]
  248 |     int fd;
      |         ^~

Fixes: 6a7661f ("Get rid of PATH_MAX")
Closes: #87
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/lib/libxcb/-/merge_requests/86>
This commit is contained in:
Alan Coopersmith 2026-03-15 13:30:45 -07:00
parent dc3178bc88
commit 17682ba754
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/xcb_util.c
View file

@ -93,6 +93,7 @@ int xcb_sumof(uint8_t *list, int len)
return s;
}
#ifndef _WIN32
/* Return true and parse if name matches <path to socket>[.<screen>]
* Upon success:
* host = <path to socket>
@ -156,6 +157,7 @@ static int _xcb_parse_display_path_to_socket(const char *name, char **host, char
return 1;
}
#endif __WIN32
static int _xcb_parse_display(const char *name, char **host, char **protocol,
int *displayp, int *screenp)
@ -168,12 +170,14 @@ static int _xcb_parse_display(const char *name, char **host, char **protocol,
if(!name)
return 0;
#ifndef _WIN32
/* First check for <path to socket>[.<screen>] */
if (name[0] == '/')
return _xcb_parse_display_path_to_socket(name, host, protocol, displayp, screenp);
if (strncmp(name, "unix:", 5) == 0)
return _xcb_parse_display_path_to_socket(name + 5, host, protocol, displayp, screenp);
#endif
slash = strrchr(name, '/');
@ -245,6 +249,7 @@ static int _xcb_open_unix(char *protocol, const char *file);
static int _xcb_open(const char *host, char *protocol, const int display)
{
#ifndef _WIN32
int fd;
#ifdef __hpux
static const char unix_base[] = "/usr/spool/sockets/X11/";
@ -255,7 +260,6 @@ static int _xcb_open(const char *host, char *protocol, const int display)
size_t filelen;
char *file = NULL;
#ifndef _WIN32
if (protocol && strcmp("unix", protocol) == 0 && host && host[0] == '/') {
/* Full path to socket provided, ignore everything else */
filelen = strlen(host) + 1;
@ -266,7 +270,8 @@ static int _xcb_open(const char *host, char *protocol, const int display)
return -1;
memcpy(file, host, filelen);
} else {
#endif
#endif /* _WIN32 */
/* If protocol or host is "unix", fall through to Unix socket code below */
if ((!protocol || (strcmp("unix",protocol) != 0)) &&
(*host != '\0') && (strcmp("unix",host) != 0))