Launch scroll program with the default shell

[st.git] / st.c

diff --git a/st.c b/st.c
index 81973ee..59db144 100644 (file)
--- a/st.c
+++ b/st.c
@@ -366,7 +366,8 @@ static const char base64_digits[] = {
 char
 base64dec_getc(const char **src)
 {
 char
 base64dec_getc(const char **src)
 {

-       while (**src && !isprint(**src)) (*src)++;
+       while (**src && !isprint(**src))
+               (*src)++;

        return **src ? *((*src)++) : '=';  /* emulate padding if string ends */
 }
 
        return **src ? *((*src)++) : '=';  /* emulate padding if string ends */
 }
 


@@ -681,9 +682,12 @@ execsh(char *cmd, char **args)
        if (args) {
                prog = args[0];
                arg = NULL;
        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;
        } else {
                prog = sh;
                arg = NULL;