blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Xwayland second socket path on non-Linux systems 

It was creating two sockets with the same path
This commit is contained in:
Greg V 2017-11-22 15:17:10 +03:00
parent e6bf92cf02
commit 71aa634ac5
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xwayland/sockets.c
View File

@ -21,6 +21,7 @@
static const char *lock_fmt = "/tmp/.X%d-lock"; static const char *lock_fmt = "/tmp/.X%d-lock";
static const char *socket_dir = "/tmp/.X11-unix"; static const char *socket_dir = "/tmp/.X11-unix";
static const char *socket_fmt = "/tmp/.X11-unix/X%d"; static const char *socket_fmt = "/tmp/.X11-unix/X%d";
static const char *socket_fmt2 = "/tmp/.X11-unix/X%d_";
static int open_socket(struct sockaddr_un *addr, size_t path_size) { static int open_socket(struct sockaddr_un *addr, size_t path_size) {
int fd, rc; int fd, rc;
@ -73,7 +74,7 @@ static bool open_sockets(int socks[2], int display) {
addr.sun_path[0] = 0; addr.sun_path[0] = 0;
path_size = snprintf(addr.sun_path + 1, sizeof(addr.sun_path) - 1, socket_fmt, display); path_size = snprintf(addr.sun_path + 1, sizeof(addr.sun_path) - 1, socket_fmt, display);
#else #else
path_size = snprintf(addr.sun_path, sizeof(addr.sun_path), socket_fmt, display); path_size = snprintf(addr.sun_path, sizeof(addr.sun_path), socket_fmt2, display);
#endif #endif
socks[0] = open_socket(&addr, path_size); socks[0] = open_socket(&addr, path_size);
if (socks[0] < 0) { if (socks[0] < 0) {
@ -97,6 +98,11 @@ void unlink_display_sockets(int display) {
snprintf(sun_path, sizeof(sun_path), socket_fmt, display); snprintf(sun_path, sizeof(sun_path), socket_fmt, display);
unlink(sun_path); unlink(sun_path);
#ifndef __linux__
snprintf(sun_path, sizeof(sun_path), socket_fmt2, display);
unlink(sun_path);
#endif
snprintf(sun_path, sizeof(sun_path), lock_fmt, display); snprintf(sun_path, sizeof(sun_path), lock_fmt, display);
unlink(sun_path); unlink(sun_path);
} }