X-Git-Url: https://git.xinqibao.xyz/st.git/blobdiff_plain/11625c7166b7e4dad414606227acec2de1c36464..4418939dd9f3a7b3cfd3071234ed18ae86538f2a:/st.c

diff --git a/st.c b/st.c
index ad52280..4499be6 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)
@@ -1187,7 +1190,7 @@ execsh(void) {
 	signal(SIGALRM, SIG_DFL);
 
 	execvp(prog, args);
-	exit(EXIT_FAILURE);
+	_exit(EXIT_FAILURE);
 }
 
 void