From: Derek Foreman <derekf@osg.samsung.com>
Date: Wed, 8 Feb 2017 15:37:49 +0000 (-0600)
Subject: Revert "elput - use vpath to get xdg runtime to also be setuid safe"
X-Git-Tag: upstream/1.20.0~2109
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=62a22fd401128affb4f9bdca6d6db35a90dd6e19;p=platform%2Fupstream%2Fefl.git

Revert "elput - use vpath to get xdg runtime to also be setuid safe"

This reverts commit 24e34e19a1db84cdcb6241207cb99d14ca83c41b.

This broke keyboard input for the enlightenment wayland compositor,
please test elput changes on at least one of the drm backends,
preferably with enlightenment.

The wayland compositor is hard enough to keep stable due to breakage
from core changes only tested on X - but elput's main user is our
wayland compositor, was this tested anywhere?
---

diff --git a/src/lib/elput/elput_evdev.c b/src/lib/elput/elput_evdev.c
index 028bf62..a83ebc1 100644
--- a/src/lib/elput/elput_evdev.c
+++ b/src/lib/elput/elput_evdev.c
@@ -60,19 +60,16 @@ _keyboard_modifiers_update(Elput_Keyboard *kbd, Elput_Seat *seat)
 static int
 _keyboard_fd_get(off_t size)
 {
-   const char *path;
-   Eina_Tmpstr *fullname;
-   long flags;
    int fd = 0;
+   char *path;
    char tmp[PATH_MAX];
+   long flags;
+   Eina_Tmpstr *fullname;
+
+   if (!(path = getenv("XDG_RUNTIME_DIR")))
+     return -1;
 
-   Efl_Vpath_File *file_obj =
-     efl_vpath_manager_fetch(EFL_VPATH_MANAGER_CLASS, "(:run:)");
-   efl_vpath_file_do(file_obj);
-   efl_vpath_file_wait(file_obj);
-   path = efl_vpath_file_result_get(file_obj);
    snprintf(tmp, sizeof(tmp), "%s/elput-keymap-XXXXXX", path);
-   efl_del(file_obj);
 
    fd = eina_file_mkstemp(tmp, &fullname);
    if (fd < 0) return -1;