summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2017-02-08 09:37:49 -0600
committerDerek Foreman <derekf@osg.samsung.com>2017-02-08 09:47:33 -0600
commit62a22fd401128affb4f9bdca6d6db35a90dd6e19 (patch)
tree32783f5130bfeec9c44b29dd8c19523615c2f010
parent53cc1eab045ed6acb86155ae0f77006873df6125 (diff)
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?
-rw-r--r--src/lib/elput/elput_evdev.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/lib/elput/elput_evdev.c b/src/lib/elput/elput_evdev.c
index 028bf62af4..a83ebc10de 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)
60static int 60static int
61_keyboard_fd_get(off_t size) 61_keyboard_fd_get(off_t size)
62{ 62{
63 const char *path;
64 Eina_Tmpstr *fullname;
65 long flags;
66 int fd = 0; 63 int fd = 0;
64 char *path;
67 char tmp[PATH_MAX]; 65 char tmp[PATH_MAX];
66 long flags;
67 Eina_Tmpstr *fullname;
68
69 if (!(path = getenv("XDG_RUNTIME_DIR")))
70 return -1;
68 71
69 Efl_Vpath_File *file_obj =
70 efl_vpath_manager_fetch(EFL_VPATH_MANAGER_CLASS, "(:run:)");
71 efl_vpath_file_do(file_obj);
72 efl_vpath_file_wait(file_obj);
73 path = efl_vpath_file_result_get(file_obj);
74 snprintf(tmp, sizeof(tmp), "%s/elput-keymap-XXXXXX", path); 72 snprintf(tmp, sizeof(tmp), "%s/elput-keymap-XXXXXX", path);
75 efl_del(file_obj);
76 73
77 fd = eina_file_mkstemp(tmp, &fullname); 74 fd = eina_file_mkstemp(tmp, &fullname);
78 if (fd < 0) return -1; 75 if (fd < 0) return -1;