From 8a7264e90577205e81cccb76117e93282d65697c Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 18 Aug 2021 20:18:35 +0200 Subject: slave: set TERMINFO instead of TERMINFO_DIRS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This seems to be slightly better supported than TERMINFO_DIRS. It also simplifies our code, since it’s no longer an issue of whether to append or not - we just set TERMINFO, and ignore whatever it was set to before. Also closes #687 --- slave.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'slave.c') diff --git a/slave.c b/slave.c index 1cb7970c..9cf49cfa 100644 --- a/slave.c +++ b/slave.c @@ -290,15 +290,7 @@ slave_spawn(int ptmx, int argc, const char *cwd, char *const *argv, setenv("COLORTERM", "truecolor", 1); #if defined(FOOT_TERMINFO_PATH) - const char *terminfo_dirs = getenv("TERMINFO_DIRS"); - if (terminfo_dirs != NULL) { - char *updated_terminfo_dirs = - xasprintf("%s:%s", terminfo_dirs, FOOT_TERMINFO_PATH); - - setenv("TERMINFO_DIRS", updated_terminfo_dirs, 1); - free(updated_terminfo_dirs); - } else - setenv("TERMINFO_DIRS", FOOT_TERMINFO_PATH, 1); + setenv("TERMINFO", FOOT_TERMINFO_PATH, 1); #endif char **_shell_argv = NULL; -- cgit v1.3