mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-04-14 08:21:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

slave: set TERM environment variable in slave process

Browse source
This commit is contained in:
Daniel Eklöf 2019-11-01 21:01:15 +01:00
parent d2b395bd43
commit 69d62d3cd2
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
4 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
main.c
View file

@ -161,7 +161,6 @@ main(int argc, char *const *argv)
argv += optind; argv += optind;
setlocale(LC_ALL, ""); setlocale(LC_ALL, "");
setenv("TERM", conf.term, 1);
struct fdm *fdm = NULL; struct fdm *fdm = NULL;
struct wayland *wayl = NULL; struct wayland *wayl = NULL;

5
slave.c
View file

@ -1,5 +1,6 @@
#define _XOPEN_SOURCE 500 #define _XOPEN_SOURCE 500
#include "slave.h" #include "slave.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
@ -68,7 +69,7 @@ err:
pid_t pid_t
slave_spawn(int ptmx, int argc, char *const *argv, 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]; int fork_pipe[2];
if (pipe2(fork_pipe, O_CLOEXEC) < 0) { if (pipe2(fork_pipe, O_CLOEXEC) < 0) {
@ -88,6 +89,8 @@ slave_spawn(int ptmx, int argc, char *const *argv,
/* Child */ /* Child */
close(fork_pipe[0]); /* Close read end */ close(fork_pipe[0]); /* Close read end */
setenv("TERM", term_env, 1);
char **_shell_argv = NULL; char **_shell_argv = NULL;
char *const *shell_argv = argv; char *const *shell_argv = argv;

2
slave.h
View file

@ -4,4 +4,4 @@
#include <sys/types.h> #include <sys/types.h>
pid_t slave_spawn( 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);

2
terminal.c
View file

@ -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); LOG_INFO("cell width=%d, height=%d", term->cell_width, term->cell_height);
/* Start the slave/client */ /* 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; goto err;
/* Initiailze the Wayland window backend */ /* Initiailze the Wayland window backend */