mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-01-31 05:06:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

switch to execle and supply child_envp as the environment pointer

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

5
sway/commands/exec_always.c
View file

@ -4,6 +4,7 @@
#include <sys/wait.h> #include <sys/wait.h>
#include <unistd.h> #include <unistd.h>
#include <signal.h> #include <signal.h>
#include <glib.h>
#include "sway/commands.h" #include "sway/commands.h"
#include "sway/config.h" #include "sway/config.h"
#include "sway/server.h" #include "sway/server.h"
@ -14,6 +15,8 @@
#include "log.h" #include "log.h"
#include "stringop.h" #include "stringop.h"
extern char** child_envp;
struct cmd_results *cmd_exec_validate(int argc, char **argv) { struct cmd_results *cmd_exec_validate(int argc, char **argv) {
struct cmd_results *error = NULL; struct cmd_results *error = NULL;
if ((error = checkarg(argc, argv[-1], EXPECTED_AT_LEAST, 1))) { if ((error = checkarg(argc, argv[-1], EXPECTED_AT_LEAST, 1))) {
@ -81,7 +84,7 @@ struct cmd_results *cmd_exec_process(int argc, char **argv) {
if (ctx && !no_startup_id) { if (ctx && !no_startup_id) {
export_startup_id(ctx); export_startup_id(ctx);
} }
execlp("sh", "sh", "-c", cmd, (void *)NULL); execle("/bin/sh", "sh", "-c", cmd, (void *)NULL, child_envp);
sway_log_errno(SWAY_ERROR, "execlp failed"); sway_log_errno(SWAY_ERROR, "execlp failed");
_exit(1); _exit(1);
} }