[dev] [PATCH] Launch scroll program with the default shell

From: Quentin Rameau <quinq_AT_fifth.space>
Date: Sat, 11 Apr 2020 12:29:48 +0200

---
 st.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/st.c b/st.c
index e51fe15..fcfbb1a 100644
--- a/st.c
+++ b/st.c
_AT_@ -689,14 +689,16 @@ 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;
 	}
-	DEFAULT(args, ((char *[]) {prog, arg, NULL}));
 
 	unsetenv("COLUMNS");
 	unsetenv("LINES");
_AT_@ -714,7 +716,7 @@ execsh(char *cmd, char **args)
 	signal(SIGTERM, SIG_DFL);
 	signal(SIGALRM, SIG_DFL);
 
-	execvp(prog, args);
+	execvp(prog, arg);
 	_exit(1);
 }
 
-- 
2.26.0
Received on Sat Apr 11 2020 - 12:29:48 CEST

This archive was generated by hypermail 2.3.0 : Sat Apr 11 2020 - 12:36:08 CEST