callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wayland: Don't hardcode /tmp

Browse Source 
As pointed out in https://bugzilla.gnome.org/show_bug.cgi?id=760964,
we should use the GLib facilities for determining the preferred
location for temporary files.
This commit is contained in:
Matthias Clasen
2016-01-21 22:53:06 -05:00
parent d3f18abf7d
commit eb2ef63211
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gdk/wayland/gdkdisplay-wayland.c
View File

@ -928,24 +928,27 @@ create_shm_pool (struct wl_shm *shm,
size_t *buf_length, size_t *buf_length,
void **data_out) void **data_out)
{ {
char filename[] = "/tmp/wayland-shm-XXXXXX"; char *filename;
struct wl_shm_pool *pool; struct wl_shm_pool *pool;
int fd; int fd;
void *data; void *data;
filename = g_strconcat (g_get_tmp_dir (), G_DIR_SEPARATOR_S, "wayland-shm-XXXXXX", NULL);
fd = mkstemp (filename); fd = mkstemp (filename);
if (fd < 0) if (fd < 0)
{ {
g_critical (G_STRLOC ": Unable to create temporary file (%s): %s", g_critical (G_STRLOC ": Unable to create temporary file (%s): %s",
filename, g_strerror (errno)); filename, g_strerror (errno));
g_free (filename);
return NULL; return NULL;
} }
unlink (filename); unlink (filename);
if (ftruncate (fd, size) < 0) if (ftruncate (fd, size) < 0)
{ {
g_critical (G_STRLOC ": Truncating temporary file failed: %s", g_critical (G_STRLOC ": Truncating temporary file (%s) failed: %s",
g_strerror (errno)); filename, g_strerror (errno));
g_free (filename);
close (fd); close (fd);
return NULL; return NULL;
} }
@ -954,8 +957,9 @@ create_shm_pool (struct wl_shm *shm,
if (data == MAP_FAILED) if (data == MAP_FAILED)
{ {
g_critical (G_STRLOC ": mmap'ping temporary file failed: %s", g_critical (G_STRLOC ": mmap'ping temporary file (%s) failed: %s",
g_strerror (errno)); filename, g_strerror (errno));
g_free (filename);
close (fd); close (fd);
return NULL; return NULL;
} }
@ -963,6 +967,7 @@ create_shm_pool (struct wl_shm *shm,
pool = wl_shm_create_pool (shm, fd, size); pool = wl_shm_create_pool (shm, fd, size);
close (fd); close (fd);
g_free (filename);
*data_out = data; *data_out = data;
*buf_length = size; *buf_length = size;