aboutsummaryrefslogtreecommitdiff
path: root/spawn.c
diff options
context:
space:
mode:
Diffstat (limited to 'spawn.c')
-rw-r--r--spawn.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/spawn.c b/spawn.c
index 8c5c33d2..7c6641da 100644
--- a/spawn.c
+++ b/spawn.c
@@ -17,7 +17,8 @@
bool
spawn(struct reaper *reaper, const char *cwd, char *const argv[],
- int stdin_fd, int stdout_fd, int stderr_fd)
+ int stdin_fd, int stdout_fd, int stderr_fd,
+ const char *xdg_activation_token)
{
int pipe_fds[2] = {-1, -1};
if (pipe2(pipe_fds, O_CLOEXEC) < 0) {
@@ -47,14 +48,24 @@ spawn(struct reaper *reaper, const char *cwd, char *const argv[],
/* Restore ignored (SIG_IGN) signals */
struct sigaction dfl = {.sa_handler = SIG_DFL};
sigemptyset(&dfl.sa_mask);
- if (sigaction(SIGHUP, &dfl, NULL) < 0)
+ if (sigaction(SIGHUP, &dfl, NULL) < 0 ||
+ sigaction(SIGPIPE, &dfl, NULL) < 0)
+ {
goto child_err;
+ }
if (cwd != NULL && chdir(cwd) < 0) {
LOG_WARN("failed to change working directory to %s: %s",
cwd, strerror(errno));
}
+ if (xdg_activation_token != NULL) {
+ setenv("XDG_ACTIVATION_TOKEN", xdg_activation_token, 1);
+
+ if (getenv("DISPLAY") != NULL)
+ setenv("DESKTOP_STARTUP_ID", xdg_activation_token, 1);
+ }
+
bool close_stderr = stderr_fd >= 0;
bool close_stdout = stdout_fd >= 0 && stdout_fd != stderr_fd;
bool close_stdin = stdin_fd >= 0 && stdin_fd != stdout_fd && stdin_fd != stderr_fd;