From 6d4e525ed95fbddc38be441394a02dc9233b157d Mon Sep 17 00:00:00 2001 From: Christoph Lohmann <20h@r-36.net> Date: Sun, 28 Oct 2012 06:54:08 +0100 Subject: [PATCH] Applying the patch of Roberto Caballero to set WINDOWID and all the pwuid() variables. Thanks! xinit() and ttynew() had to be switched in their call-appearance. Otherwise xw.win is not set. --- st.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/st.c b/st.c index 3cd7831..f54e4d5 100644 --- a/st.c +++ b/st.c @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -881,11 +882,23 @@ void execsh(void) { char **args; char *envshell = getenv("SHELL"); + const struct passwd *pass = getpwuid(getuid()); + char buf[sizeof(long) * 8 + 1]; unsetenv("COLUMNS"); unsetenv("LINES"); unsetenv("TERMCAP"); + if(pass) { + setenv("LOGNAME", pass->pw_name, 1); + setenv("USER", pass->pw_name, 1); + setenv("SHELL", pass->pw_shell, 0); + setenv("HOME", pass->pw_dir, 0); + } + + snprintf(buf, sizeof(buf), "%lu", xw.win); + setenv("WINDOWID", buf, 1); + signal(SIGCHLD, SIG_DFL); signal(SIGHUP, SIG_DFL); signal(SIGINT, SIG_DFL); @@ -2795,8 +2808,8 @@ main(int argc, char *argv[]) { run: setlocale(LC_CTYPE, ""); tnew(80, 24); - ttynew(); xinit(); + ttynew(); selinit(); run(); return 0; -- 2.20.1