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. --- main.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'main.c') diff --git a/main.c b/main.c index ee9900cb..d3bef78a 100644 --- a/main.c +++ b/main.c @@ -7,6 +7,7 @@ #include #include #include +#include #include @@ -217,6 +218,16 @@ main(int argc, char *const *argv) struct server *server = NULL; struct shutdown_context shutdown_ctx = {.term = &term, .exit_code = EXIT_FAILURE}; + char *cwd = NULL; + { + size_t buf_len = 1024; + do { + cwd = realloc(cwd, buf_len); + getcwd(cwd, buf_len); + buf_len *= 2; + } while (errno == ERANGE); + } + if ((fdm = fdm_init()) == NULL) goto out; @@ -224,9 +235,12 @@ main(int argc, char *const *argv) goto out; if (!as_server && (term = term_init( - &conf, fdm, wayl, conf.term, "foot", argc, argv, - &term_shutdown_cb, &shutdown_ctx)) == NULL) + &conf, fdm, wayl, conf.term, "foot", cwd, argc, argv, + &term_shutdown_cb, &shutdown_ctx)) == NULL) { + free(cwd); goto out; + } + free(cwd); if (as_server && (server = server_init(&conf, fdm, wayl)) == NULL) goto out; -- cgit v1.3