use SHELL as default shell.

[st.git] / st.c

diff --git a/st.c b/st.c
index 89d123c..741e680 100644 (file)
--- a/st.c
+++ b/st.c
@@ -709,7 +709,7 @@ execsh(void) {
        char **args;
        char *envshell = getenv("SHELL");
 
-       DEFAULT(envshell, "sh");
+       DEFAULT(envshell, SHELL);
        putenv("TERM="TNAME);
        args = opt_cmd ? opt_cmd : (char*[]){envshell, "-i", NULL};
        execvp(args[0], args);
@@ -1387,8 +1387,17 @@ csihandle(void) {
 
 void
 csidump(void) {
-       fwrite("\033[", 1, 2, stdout);
-       fwrite(escseq.buf, 1, escseq.len, stdout);
+       int i;
+       printf("ESC[");
+       for(i = 0; i < escseq.len; i++) {
+               uint c = escseq.buf[i] & 0xff;
+               if(isprint(c)) putchar(c);
+               else if(c == '\n') printf("(\\n)");
+               else if(c == '\r') printf("(\\r)");
+               else if(c == 0x1b) printf("(\\e)");
+               else printf("(%02x)", c);
+       }
+       putchar('\n');
 }
 
 void