Commit 6e8a6624 authored by Jasper St. Pierre's avatar Jasper St. Pierre
Browse files

server: Create the socket FD after taking the lock

We're going to split out the lock-taking to another function so we
can repetitively try locks.
parent 68dd7d1f
......@@ -1083,12 +1083,6 @@ wl_display_add_socket(struct wl_display *display, const char *name)
if (s == NULL)
return -1;
s->fd = wl_os_socket_cloexec(PF_LOCAL, SOCK_STREAM, 0);
if (s->fd < 0) {
wl_socket_destroy(s);
return -1;
}
if (name == NULL)
name = getenv("WAYLAND_DISPLAY");
if (name == NULL)
......@@ -1115,6 +1109,12 @@ wl_display_add_socket(struct wl_display *display, const char *name)
return -1;
}
s->fd = wl_os_socket_cloexec(PF_LOCAL, SOCK_STREAM, 0);
if (s->fd < 0) {
wl_socket_destroy(s);
return -1;
}
size = offsetof (struct sockaddr_un, sun_path) + name_size;
if (bind(s->fd, (struct sockaddr *) &s->addr, size) < 0) {
wl_log("bind() failed with error: %m\n");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment