From 39146fac5cb7db4d0b68ba685722ca4713ddf722 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Sat, 21 Dec 2019 19:57:28 +0100 Subject: term: term_init: add 'cwd' argument This is used when spawning the slave, to set its current working directory just before we exec() the client. In a regular foot instance, we set the cwd from getcwd(). In a foot server instance, each connecting client sends its cwd to the server, and we use that. --- slave.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'slave.c') diff --git a/slave.c b/slave.c index bffa48a8..857640b2 100644 --- a/slave.c +++ b/slave.c @@ -69,7 +69,7 @@ err: } pid_t -slave_spawn(int ptmx, int argc, char *const *argv, +slave_spawn(int ptmx, int argc, const char *cwd, char *const *argv, const char *term_env, const char *conf_shell) { int fork_pipe[2]; @@ -90,6 +90,8 @@ slave_spawn(int ptmx, int argc, char *const *argv, /* Child */ close(fork_pipe[0]); /* Close read end */ + chdir(cwd); + /* Restore signals */ const struct sigaction sa = {.sa_handler = SIG_DFL}; if (sigaction(SIGINT, &sa, NULL) < 0 || -- cgit v1.3