aboutsummaryrefslogtreecommitdiff
path: root/slave.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2022-04-11 10:19:40 +0000
committerDaniel Eklöf <daniel@ekloef.se>2022-04-12 13:07:40 +0000
commitd02124902b4e27c3ed3ef48442ce17c5e0af9d56 (patch)
tree517a07bdc4b2f26a2c3d30fcb1ee102c87622e7e /slave.c
parentcsi: reduce duplication in code handling SGR 38 and 48 sequences (diff)
client: add -E,--client-environment
When this option is used, the child process in the new terminal instance will inherit its environment from the footclient process, instead of the foot server’s. Implemented by sending (yet another) dynamic string list as part of the client -> server setup packet. When the new option is *not* used, the setup packet is now 2 bytes larger than before. On the server side, the slave process now uses execvpe() instead of execvp(). There’s plumbing to propagate a new ‘envp’ argument from term_init() all the way down to slave_exec(). If ‘envp’ is NULL, we use ‘environ’ instead (thus matching the old behavior of execvp()). Closes #1004
Diffstat (limited to 'slave.c')
-rw-r--r--slave.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/slave.c b/slave.c
index 4fbd5c9b..4e8610ce 100644
--- a/slave.c
+++ b/slave.c
@@ -145,8 +145,8 @@ emit_notifications(int fd, const user_notifications_t *notifications)
}
static noreturn void
-slave_exec(int ptmx, char *argv[], int err_fd, bool login_shell,
- const user_notifications_t *notifications)
+slave_exec(int ptmx, char *argv[], char *const envp[], int err_fd,
+ bool login_shell, const user_notifications_t *notifications)
{
int pts = -1;
const char *pts_name = ptsname(ptmx);
@@ -232,7 +232,7 @@ slave_exec(int ptmx, char *argv[], int err_fd, bool login_shell,
} else
file = argv[0];
- execvp(file, argv);
+ execvpe(file, argv, envp);
err:
(void)!write(err_fd, &errno, sizeof(errno));
@@ -246,8 +246,8 @@ err:
pid_t
slave_spawn(int ptmx, int argc, const char *cwd, char *const *argv,
- const char *term_env, const char *conf_shell, bool login_shell,
- const user_notifications_t *notifications)
+ char *const *envp, const char *term_env, const char *conf_shell,
+ bool login_shell, const user_notifications_t *notifications)
{
int fork_pipe[2];
if (pipe2(fork_pipe, O_CLOEXEC) < 0) {
@@ -319,7 +319,8 @@ slave_spawn(int ptmx, int argc, const char *cwd, char *const *argv,
if (is_valid_shell(shell_argv[0]))
setenv("SHELL", shell_argv[0], 1);
- slave_exec(ptmx, shell_argv, fork_pipe[1], login_shell, notifications);
+ slave_exec(ptmx, shell_argv, envp != NULL ? envp : environ,
+ fork_pipe[1], login_shell, notifications);
BUG("Unexpected return from slave_exec()");
break;