mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-02-07 08:30:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

create an environment pointer for child processes

Browse source
This commit is contained in:
slonkazoid 2024-09-08 18:22:00 +03:00
parent 8830b1f992
commit f7d611af7b
No known key found for this signature in database
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sway/main.c
View file

@ -1,5 +1,6 @@
#include <getopt.h> #include <getopt.h>
#include <pango/pangocairo.h> #include <pango/pangocairo.h>
#include <glib.h>
#include <signal.h> #include <signal.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h> #include <stdio.h>
@ -30,6 +31,7 @@ static int exit_value = 0;
static struct rlimit original_nofile_rlimit = {0}; static struct rlimit original_nofile_rlimit = {0};
struct sway_server server = {0}; struct sway_server server = {0};
struct sway_debug debug = {0}; struct sway_debug debug = {0};
char **child_envp;
void sway_terminate(int exit_code) { void sway_terminate(int exit_code) {
if (!server.wl_display) { if (!server.wl_display) {
@ -348,6 +350,8 @@ int main(int argc, char **argv) {
ipc_init(&server); ipc_init(&server);
setenv("WAYLAND_DISPLAY", server.socket, true); setenv("WAYLAND_DISPLAY", server.socket, true);
// g_get_environ creates a newly-allocated environment buffer
child_envp = g_get_environ();
if (!load_main_config(config_path, false, false)) { if (!load_main_config(config_path, false, false)) {
sway_terminate(EXIT_FAILURE); sway_terminate(EXIT_FAILURE);
goto shutdown; goto shutdown;
@ -381,6 +385,7 @@ shutdown:
free(config_path); free(config_path);
free_config(config); free_config(config);
g_strfreev(child_envp);
pango_cairo_font_map_set_default(NULL); pango_cairo_font_map_set_default(NULL);