snark/st
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

use SHELL environment variable (thx Thomas Adam)

Browse source
This commit is contained in:
Aurélien Aptel 2010-04-26 19:20:53 +02:00
parent b3b7ffce5f
commit d01c55c9ab
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config.h
View file

@ -1,4 +1,3 @@
#define SHELL "/bin/bash"
#define TAB 8 #define TAB 8
#define FONT "6x13" #define FONT "6x13"

10
st.c
View file

@ -208,9 +208,12 @@ die(const char *errstr, ...) {
void void
execsh(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); putenv("TERM=" TNAME);
execvp(SHELL, args); execvp(shell, args);
} }
void void
@ -844,7 +847,6 @@ tputtab(void) {
void void
tputc(char c) { tputc(char c) {
/* dump(c); */
if(term.esc & ESC_START) { if(term.esc & ESC_START) {
if(term.esc & ESC_CSI) { if(term.esc & ESC_CSI) {
escseq.buf[escseq.len++] = c; escseq.buf[escseq.len++] = c;
@ -1277,7 +1279,7 @@ run(void) {
} }
if(FD_ISSET(cmdfd, &rfd)) { if(FD_ISSET(cmdfd, &rfd)) {
ttyread(); ttyread();
draw(SCREEN_UPDATE); draw(SCREEN_UPDATE);
} }
while(XPending(xw.dis)) { while(XPending(xw.dis)) {
XNextEvent(xw.dis, &ev); XNextEvent(xw.dis, &ev);