X-Git-Url: https://jasonwoof.com/gitweb/?p=st.git;a=blobdiff_plain;f=st.c;h=ee79a33759fd23cbbd8e15c064c664974d7a29a8;hp=deb161055009db9f6fd2dccb94b535fa648d9ecf;hb=d01c55c9ab58588d98239c515aa8db6443ae75ca;hpb=b3b7ffce5f1cb1d82aa26df976f0316d89d15d7f

diff --git a/st.c b/st.c
index deb1610..ee79a33 100755
--- a/st.c
+++ b/st.c
@@ -208,9 +208,12 @@ die(const char *errstr, ...) {
 
 void
 execsh(void) {
-	char *args[3] = {SHELL, "-i", NULL};
+	char *shell = getenv("SHELL");
+	if(!shell)
+		shell = "/bin/sh";
+	char *args[3] = {shell, "-i", NULL};
 	putenv("TERM=" TNAME);
-	execvp(SHELL, args);
+	execvp(shell, args);
 }
 
 void
@@ -844,7 +847,6 @@ tputtab(void) {
 
 void
 tputc(char c) {
-	/* dump(c); */
 	if(term.esc & ESC_START) {
 		if(term.esc & ESC_CSI) {
 			escseq.buf[escseq.len++] = c;
@@ -1277,7 +1279,7 @@ run(void) {
 		}
 		if(FD_ISSET(cmdfd, &rfd)) {
 			ttyread();
-			draw(SCREEN_UPDATE);
+			draw(SCREEN_UPDATE); 
 		}
 		while(XPending(xw.dis)) {
 			XNextEvent(xw.dis, &ev);