diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2019-12-21 18:57:28 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2019-12-21 18:57:28 +0000 |
| commit | 39146fac5cb7db4d0b68ba685722ca4713ddf722 (patch) | |
| tree | 1b6bed7901d67048edfaf09e87ec87efaf301a85 /main.c | |
| parent | client/server: client sends its CWD to server (diff) | |
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.
Diffstat (limited to 'main.c')
| -rw-r--r-- | main.c | 18 |
1 files changed, 16 insertions, 2 deletions
@@ -7,6 +7,7 @@ #include <getopt.h> #include <signal.h> #include <errno.h> +#include <unistd.h> #include <sys/sysinfo.h> @@ -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; |
