xwayland: remove clearenv() call

This has been causing troubles for some of our users and only been there
for legacy reasons, we trust Xwayland just as much as your next program
and weston doesn't take any such care when starting it.

1 files changed, 1 insertions, 20 deletions

diff --git a/xwayland/xwayland.c b/xwayland/xwayland.c
index e6d3502c..e6f15735 100644
--- a/xwayland/xwayland.c
+++ b/xwayland/xwayland.c
@@ -1,4 +1,4 @@
-#define _DEFAULT_SOURCE
+#define _POSIX_C_SOURCE 200112L
 #ifdef __FreeBSD__
 // for SOCK_CLOEXEC
 #define __BSD_VISIBLE 1
@@ -21,14 +21,6 @@
 #include "util/signal.h"
 #include "xwayland/xwm.h"
 
-#ifdef __FreeBSD__
-static inline int clearenv(void) {
-	extern char **environ;
-	environ[0] = NULL;
-	return 0;
-}
-#endif
-
 struct wlr_xwayland_cursor {
 	uint8_t *pixels;
 	uint32_t stride;
@@ -102,17 +94,6 @@ static void exec_xwayland(struct wlr_xwayland *wlr_xwayland) {
 		_exit(EXIT_FAILURE);
 	}
 
-	const char *xdg_runtime = getenv("XDG_RUNTIME_DIR");
-	const char *path_var = getenv("PATH");
-	if (clearenv() != 0) {
-		wlr_log_errno(WLR_ERROR, "clearenv failed");
-		_exit(EXIT_FAILURE);
-	}
-	if (xdg_runtime != NULL) {
-		setenv("XDG_RUNTIME_DIR", xdg_runtime, true);
-	}
-	setenv("PATH", path_var, true);
-
 	char wayland_socket_str[16];
 	snprintf(wayland_socket_str, sizeof(wayland_socket_str), "%d", wlr_xwayland->wl_fd[1]);
 	setenv("WAYLAND_SOCKET", wayland_socket_str, true);