mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2026-03-03 01:41:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

server: Allow absolute paths in WAYLAND_DISPLAY

Browse source 
The compositor should handle absolute paths in WAYLAND_DISPLAY like the clients, ie not
adding the XDG_RUNTIME_DIR prefix if it's an absolute path.

This allows to create the wayland socket in a separate directory for system compositors if
desired. Clients could then directly inherit the environment variable.

Signed-off-by: Loïc Yhuel <loic.yhuel@softathome.com>
This commit is contained in:
Loïc Yhuel 2019-11-14 14:13:17 +01:00
parent 69b8eaf385
commit d32e77692c
1 changed files with 25 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/wayland-server.c
View file

@ -1481,28 +1481,32 @@ static int
wl_socket_init_for_display_name(struct wl_socket *s, const char *name) wl_socket_init_for_display_name(struct wl_socket *s, const char *name)
{ {
int name_size; int name_size;
const char *runtime_dir; const char *runtime_dir = "";
const char *separator = "";
runtime_dir = getenv("XDG_RUNTIME_DIR"); if (name[0] != '/') {
if (!runtime_dir) { runtime_dir = getenv("XDG_RUNTIME_DIR");
wl_log("error: XDG_RUNTIME_DIR not set in the environment\n"); if (!runtime_dir) {
wl_log("error: XDG_RUNTIME_DIR not set in the environment\n");
/* to prevent programs reporting /* to prevent programs reporting
* "failed to add socket: Success" */ * "failed to add socket: Success" */
errno = ENOENT; errno = ENOENT;
return -1; return -1;
}
separator = "/";
} }
s->addr.sun_family = AF_LOCAL; s->addr.sun_family = AF_LOCAL;
name_size = snprintf(s->addr.sun_path, sizeof s->addr.sun_path, name_size = snprintf(s->addr.sun_path, sizeof s->addr.sun_path,
"%s/%s", runtime_dir, name) + 1; "%s%s%s", runtime_dir, separator, name) + 1;
s->display_name = (s->addr.sun_path + name_size - 1) - strlen(name); s->display_name = (s->addr.sun_path + name_size - 1) - strlen(name);
assert(name_size > 0); assert(name_size > 0);
if (name_size > (int)sizeof s->addr.sun_path) { if (name_size > (int)sizeof s->addr.sun_path) {
wl_log("error: socket path \"%s/%s\" plus null terminator" wl_log("error: socket path \"%s%s%s\" plus null terminator"
" exceeds 108 bytes\n", runtime_dir, name); " exceeds 108 bytes\n", runtime_dir, separator, name);
*s->addr.sun_path = 0; *s->addr.sun_path = 0;
/* to prevent programs reporting /* to prevent programs reporting
* "failed to add socket: Success" */ * "failed to add socket: Success" */
@ -1641,14 +1645,17 @@ wl_display_add_socket_fd(struct wl_display *display, int sock_fd)
* variable for the socket name. If WAYLAND_DISPLAY is not set, then default * variable for the socket name. If WAYLAND_DISPLAY is not set, then default
* wayland-0 is used. * wayland-0 is used.
* *
* The Unix socket will be created in the directory pointed to by environment * If the socket name is a relative path, the Unix socket will be created in
* variable XDG_RUNTIME_DIR. If XDG_RUNTIME_DIR is not set, then this function * the directory pointed to by environment variable XDG_RUNTIME_DIR. If
* fails and returns -1. * XDG_RUNTIME_DIR is not set, then this function fails and returns -1.
* *
* The length of socket path, i.e., the path set in XDG_RUNTIME_DIR and the * If the socket name is an absolute path, then it is used as-is for the
* socket name, must not exceed the maximum length of a Unix socket path. * the Unix socket.
* The function also fails if the user do not have write permission in the *
* XDG_RUNTIME_DIR path or if the socket name is already in use. * The length of the computed socket path must not exceed the maximum length
* of a Unix socket path.
* The function also fails if the user does not have write permission in the
* directory or if the path is already in use.
* *
* \memberof wl_display * \memberof wl_display
*/ */