diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2019-11-01 20:01:15 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2019-11-01 20:01:15 +0000 |
| commit | 69d62d3cd2918bee089fc879e381820349497483 (patch) | |
| tree | 44a9c5129aaf60452a6c1880a42d3b3389aff465 | |
| parent | PKGBUILD: need to execute footclient, to generate profiling data (diff) | |
slave: set TERM environment variable in slave process
| -rw-r--r-- | main.c | 1 | ||||
| -rw-r--r-- | slave.c | 5 | ||||
| -rw-r--r-- | slave.h | 2 | ||||
| -rw-r--r-- | terminal.c | 2 |
4 files changed, 6 insertions, 4 deletions
@@ -161,7 +161,6 @@ main(int argc, char *const *argv) argv += optind; setlocale(LC_ALL, ""); - setenv("TERM", conf.term, 1); struct fdm *fdm = NULL; struct wayland *wayl = NULL; @@ -1,5 +1,6 @@ #define _XOPEN_SOURCE 500 #include "slave.h" + #include <stdlib.h> #include <string.h> #include <unistd.h> @@ -68,7 +69,7 @@ err: pid_t slave_spawn(int ptmx, int argc, char *const *argv, - const char *conf_shell) + const char *term_env, const char *conf_shell) { int fork_pipe[2]; if (pipe2(fork_pipe, O_CLOEXEC) < 0) { @@ -88,6 +89,8 @@ slave_spawn(int ptmx, int argc, char *const *argv, /* Child */ close(fork_pipe[0]); /* Close read end */ + setenv("TERM", term_env, 1); + char **_shell_argv = NULL; char *const *shell_argv = argv; @@ -4,4 +4,4 @@ #include <sys/types.h> pid_t slave_spawn( - int ptmx, int argc, char *const *argv, const char *conf_shell); + int ptmx, int argc, char *const *argv, const char *term_env, const char *conf_shell); @@ -428,7 +428,7 @@ term_init(const struct config *conf, struct fdm *fdm, struct wayland *wayl, LOG_INFO("cell width=%d, height=%d", term->cell_width, term->cell_height); /* Start the slave/client */ - if ((term->slave = slave_spawn(term->ptmx, argc, argv, conf->shell)) == -1) + if ((term->slave = slave_spawn(term->ptmx, argc, argv, conf->term, conf->shell)) == -1) goto err; /* Initiailze the Wayland window backend */ |
