Launch scroll program with the default shell

[st.git] / st.c

diff --git a/st.c b/st.c
index 5f2352a..59db144 100644 (file)
--- 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 */
 }
 
@@ -681,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;
@@ -823,17 +827,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