From bafbba56cd5735c680676db2adf6f614ba61356f Mon Sep 17 00:00:00 2001 From: Eric Pruitt Date: Tue, 28 Oct 2014 17:51:42 -0700 Subject: Check for presence of SHELL environment variable - POSIX states the SHELL environment variable "... shall represent a pathname of the user's preferred command language interpreter." As such, st should check for its presence when deciding what shell to use; just as HOME can be defined to override one's passwd-defined home directory, a user should also be able to override their passwd-defined shell using the SHELL environment variable. --- st.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/st.c b/st.c index ad52280..068fbb3 100644 --- a/st.c +++ b/st.c @@ -1158,7 +1158,10 @@ execsh(void) { die("who are you?\n"); } - sh = (pw->pw_shell[0]) ? pw->pw_shell : shell; + if (!(sh = getenv("SHELL"))) { + sh = (pw->pw_shell[0]) ? pw->pw_shell : shell; + } + if(opt_cmd) prog = opt_cmd[0]; else if(utmp) -- cgit v1.2.3-70-g09d2