AcoSail/wayland
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

client: require XDG_RUNTIME_DIR

Browse Source 
An arbitrary fallback to the current directory is only confusing.

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
This commit is contained in:
Pekka Paalanen 2012-06-06 14:30:18 +03:00 committed by Kristian Høgsberg
parent aa792ad3d6
commit 0c7ca38c7f
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/wayland-client.c
View File

@ -308,16 +308,15 @@ connect_to_socket(struct wl_display *display, const char *name)
const char *runtime_dir;
size_t name_size;
display->fd = wl_os_socket_cloexec(PF_LOCAL, SOCK_STREAM, 0);
if (display->fd < 0)
return -1;
runtime_dir = getenv("XDG_RUNTIME_DIR");
if (runtime_dir == NULL) {
runtime_dir = ".";
if (!runtime_dir) {
fprintf(stderr,
"XDG_RUNTIME_DIR not set, falling back to %s\n",
runtime_dir);
"error: XDG_RUNTIME_DIR not set in the environment.\n");
/* to prevent programs reporting
* "failed to create display: Success" */
errno = ENOENT;
return -1;
}
if (name == NULL)
@ -325,6 +324,10 @@ connect_to_socket(struct wl_display *display, const char *name)
if (name == NULL)
name = "wayland-0";
display->fd = wl_os_socket_cloexec(PF_LOCAL, SOCK_STREAM, 0);
if (display->fd < 0)
return -1;
memset(&addr, 0, sizeof addr);
addr.sun_family = AF_LOCAL;
name_size =