X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=st.c;h=a5457245090ce298496b4b1f3b02fdccbc625dbd;hb=771bc401f76b329f78a285ca65355d4b43415172;hp=2ecf8f3b93135169172ee76141514de61a303f1e;hpb=fbae700a3f32db76106b0ff6f49a73ecf0c2b4fe;p=st.git

diff --git a/st.c b/st.c
index 2ecf8f3..a545724 100644
--- a/st.c
+++ b/st.c
@@ -682,9 +682,12 @@ execsh(char *cmd, char **args)
 	if (args) {
 		prog = args[0];
 		arg = NULL;
-	} else if (scroll || utmp) {
-		prog = scroll ? scroll : utmp;
-		arg = scroll ? utmp : NULL;
+	} else if (scroll) {
+		prog = scroll;
+		arg = utmp ? utmp : sh;
+	} else if (utmp) {
+		prog = utmp;
+		arg = NULL;
 	} else {
 		prog = sh;
 		arg = NULL;
@@ -820,15 +823,14 @@ ttyread(void)
 {
 	static char buf[BUFSIZ];
 	static int buflen = 0;
-	int written;
-	int ret;
+	int ret, written;
 
 	/* append read bytes to unprocessed bytes */
 	ret = read(cmdfd, buf+buflen, LEN(buf)-buflen);
 
 	switch (ret) {
 	case 0:
-		fputs("Found EOF in input\n", stderr);
+		fputs("found EOF in input\n", stderr);
 		exit(0);
 	case -1:
 		die("couldn't read from shell: %s\n", strerror(errno));
@@ -836,7 +838,7 @@ ttyread(void)
 		buflen += ret;
 		written = twrite(buf, buflen, 0);
 		buflen -= written;
-		/* keep any uncomplete utf8 char for the next call */
+		/* keep any incomplete UTF-8 byte sequence for the next call */
 		if (buflen > 0)
 			memmove(buf, buf + written, buflen);
 		return ret;