little clean up.

[st.git] / st.c

diff --git a/st.c b/st.c
index deb1610..ff43706 100755 (executable)
--- a/st.c
+++ b/st.c
@@ -208,9 +208,10 @@ die(const char *errstr, ...) {
 
 void
 execsh(void) {
-       char *args[3] = {SHELL, "-i", NULL};
+       char *args[3] = {getenv("SHELL"), "-i", NULL};
+       DEFAULT(args[0], "/bin/sh"); /* default shell if getenv() failed */
        putenv("TERM=" TNAME);
-       execvp(SHELL, args);
+       execvp(args[0], args);
 }
 
 void
@@ -844,7 +845,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 +1277,7 @@ run(void) {
                }
                if(FD_ISSET(cmdfd, &rfd)) {
                        ttyread();
-                       draw(SCREEN_UPDATE);
+                       draw(SCREEN_UPDATE); 
                }
                while(XPending(xw.dis)) {
                        XNextEvent(xw.dis, &ev);