enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

fix xwayland fd dup conditionals

This commit is contained in:
Mike Blumenkrantz 2015-04-28 16:58:55 -04:00
parent 5637f34df9
commit bd313e90dd
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/modules/xwayland/e_mod_main.c
View File

@ -192,17 +192,21 @@ _cb_xserver_event(void *data EINA_UNUSED, Ecore_Fd_Handler *hdlr EINA_UNUSED)
{
case 0:
/* dup will unset CLOEXEC on the client as cloexec closes both ends */
if ((fd = dup(socks[1]) < 0)) goto fail;
fd = dup(socks[1]);
if (fd < 0) goto fail;
snprintf(s, sizeof(s), "%d", fd);
setenv("WAYLAND_SOCKET", s, 1);
if ((fd = dup(exs->abs_fd)) < 0) goto fail;
fd = dup(exs->abs_fd);
if (fd < 0) goto fail;
snprintf(abs_fd, sizeof(abs_fd), "%d", fd);
if ((fd = dup(exs->unx_fd)) < 0) goto fail;
fd = dup(exs->unx_fd);
if (fd < 0) goto fail;
snprintf(unx_fd, sizeof(unx_fd), "%d", fd);
if ((fd = dup(wms[1])) < 0) goto fail;
fd = dup(wms[1]);
if (fd < 0) goto fail;
snprintf(wm_fd, sizeof(wm_fd), "%d", fd);
/* ignore usr1 and have X send it to the parent process */