X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=st.c;h=fc913340fdd7760179445211d856dfcb22090cf6;hb=09f5d98251469070b76f3911cc6a83d977871656;hp=ad52280d62898b01f457600187d6f923aa3e00a9;hpb=11625c7166b7e4dad414606227acec2de1c36464;p=st.git

diff --git a/st.c b/st.c
index ad52280..fc91334 100644
--- a/st.c
+++ b/st.c
@@ -947,6 +947,8 @@ getsel(void) {
 			lastx = (sel.ne.y == y) ? sel.ne.x : term.col-1;
 		}
 		last = &term.line[y][MIN(lastx, linelen-1)];
+		while(last >= gp && last->c[0] == ' ')
+			--last;
 
 		for( ; gp <= last; ++gp) {
 			if(gp->mode & ATTR_WDUMMY)
@@ -1158,7 +1160,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 +1192,7 @@ execsh(void) {
 	signal(SIGALRM, SIG_DFL);
 
 	execvp(prog, args);
-	exit(EXIT_FAILURE);
+	_exit(EXIT_FAILURE);
 }
 
 void