X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=st.c;h=2ecf8f3b93135169172ee76141514de61a303f1e;hb=019449a7e64a881be8cc5d715fe9de32726ba190;hp=5f2352af2f10fc7e97d6d127f5d2e8244cb02722;hpb=21e0d6e8b8d20903494386e7e6f43201b3761154;p=st.git

diff --git a/st.c b/st.c
index 5f2352a..2ecf8f3 100644
--- a/st.c
+++ b/st.c
@@ -366,7 +366,8 @@ static const char base64_digits[] = {
 char
 base64dec_getc(const char **src)
 {
-	while (**src && !isprint(**src)) (*src)++;
+	while (**src && !isprint(**src))
+		(*src)++;
 	return **src ? *((*src)++) : '=';  /* emulate padding if string ends */
 }
 
@@ -823,17 +824,24 @@ ttyread(void)
 	int ret;
 
 	/* append read bytes to unprocessed bytes */
-	if ((ret = read(cmdfd, buf+buflen, LEN(buf)-buflen)) < 0)
-		die("couldn't read from shell: %s\n", strerror(errno));
-	buflen += ret;
+	ret = read(cmdfd, buf+buflen, LEN(buf)-buflen);
 
-	written = twrite(buf, buflen, 0);
-	buflen -= written;
-	/* keep any uncomplete utf8 char for the next call */
-	if (buflen > 0)
-		memmove(buf, buf + written, buflen);
+	switch (ret) {
+	case 0:
+		fputs("Found EOF in input\n", stderr);
+		exit(0);
+	case -1:
+		die("couldn't read from shell: %s\n", strerror(errno));
+	default:
+		buflen += ret;
+		written = twrite(buf, buflen, 0);
+		buflen -= written;
+		/* keep any uncomplete utf8 char for the next call */
+		if (buflen > 0)
+			memmove(buf, buf + written, buflen);
+		return ret;
 
-	return ret;
+	}
 }
 
 void