1 files changed, 37 insertions, 13 deletions

diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c
index 39e48a44..8fca1909 100644
--- a/sway/commands/exec_always.c
+++ b/sway/commands/exec_always.c
@@ -7,6 +7,8 @@
 #include <signal.h>
 #include "sway/commands.h"
 #include "sway/config.h"
+#include "sway/server.h"
+#include "sway/desktop/launcher.h"
 #include "sway/tree/container.h"
 #include "sway/tree/root.h"
 #include "sway/tree/workspace.h"
@@ -24,11 +26,22 @@ struct cmd_results *cmd_exec_validate(int argc, char **argv) {
         return error;
 }
 
+static void export_xdga_token(struct launcher_ctx *ctx) {
+        const char *token = launcher_ctx_get_token_name(ctx);
+        setenv("XDG_ACTIVATION_TOKEN", token, 1);
+}
+
+static void export_startup_id(struct launcher_ctx *ctx) {
+        const char *token = launcher_ctx_get_token_name(ctx);
+        setenv("DESKTOP_STARTUP_ID", token, 1);
+}
+
 struct cmd_results *cmd_exec_process(int argc, char **argv) {
         struct cmd_results *error = NULL;
-        char *tmp = NULL;
+        char *cmd = NULL;
+        bool no_startup_id = false;
         if (strcmp(argv[0], "--no-startup-id") == 0) {
-                sway_log(SWAY_INFO, "exec switch '--no-startup-id' not supported, ignored.");
+                no_startup_id = true;
                 --argc; ++argv;
                 if ((error = checkarg(argc, argv[-1], EXPECTED_AT_LEAST, 1))) {
                         return error;
@@ -36,17 +49,12 @@ struct cmd_results *cmd_exec_process(int argc, char **argv) {
         }
 
         if (argc == 1 && (argv[0][0] == '\'' || argv[0][0] == '"')) {
-                tmp = strdup(argv[0]);
-                strip_quotes(tmp);
+                cmd = strdup(argv[0]);
+                strip_quotes(cmd);
         } else {
-                tmp = join_args(argv, argc);
+                cmd = join_args(argv, argc);
         }
 
-        // Put argument into cmd array
-        char cmd[4096];
-        strncpy(cmd, tmp, sizeof(cmd) - 1);
-        cmd[sizeof(cmd) - 1] = 0;
-        free(tmp);
         sway_log(SWAY_DEBUG, "Executing %s", cmd);
 
         int fd[2];
@@ -55,18 +63,28 @@ struct cmd_results *cmd_exec_process(int argc, char **argv) {
         }
 
         pid_t pid, child;
+        struct launcher_ctx *ctx = launcher_ctx_create_internal();
         // Fork process
         if ((pid = fork()) == 0) {
                 // Fork child process again
+                restore_nofile_limit();
                 setsid();
                 sigset_t set;
                 sigemptyset(&set);
                 sigprocmask(SIG_SETMASK, &set, NULL);
+                signal(SIGPIPE, SIG_DFL);
                 close(fd[0]);
                 if ((child = fork()) == 0) {
                         close(fd[1]);
-                        execl("/bin/sh", "/bin/sh", "-c", cmd, (void *)NULL);
-                        _exit(0);
+                        if (ctx) {
+                                export_xdga_token(ctx);
+                        }
+                        if (ctx && !no_startup_id) {
+                                export_startup_id(ctx);
+                        }
+                        execlp("sh", "sh", "-c", cmd, (void *)NULL);
+                        sway_log_errno(SWAY_ERROR, "execlp failed");
+                        _exit(1);
                 }
                 ssize_t s = 0;
                 while ((size_t)s < sizeof(pid_t)) {
@@ -75,10 +93,12 @@ struct cmd_results *cmd_exec_process(int argc, char **argv) {
                 close(fd[1]);
                 _exit(0); // Close child process
         } else if (pid < 0) {
+                free(cmd);
                 close(fd[0]);
                 close(fd[1]);
                 return cmd_results_new(CMD_FAILURE, "fork() failed");
         }
+        free(cmd);
         close(fd[1]); // close write
         ssize_t s = 0;
         while ((size_t)s < sizeof(pid_t)) {
@@ -89,8 +109,12 @@ struct cmd_results *cmd_exec_process(int argc, char **argv) {
         waitpid(pid, NULL, 0);
         if (child > 0) {
                 sway_log(SWAY_DEBUG, "Child process created with pid %d", child);
-                root_record_workspace_pid(child);
+                if (ctx != NULL) {
+                        sway_log(SWAY_DEBUG, "Recording workspace for process %d", child);
+                        ctx->pid = child;
+                }
         } else {
+                launcher_ctx_destroy(ctx);
                 return cmd_results_new(CMD_FAILURE, "Second fork() failed");
         }