From 115bb33257ece9eec1c890cc04683227678a895f Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 17 Mar 2020 11:10:12 +0000
Subject: Ignore default-shell (and use /bin/sh) if it invalid not just if it
 is tmux itself, also refuse to set the option to something invalid in the
 first place. GitHub issue 2120.

---
 tmux.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tmux.c')

diff --git a/tmux.c b/tmux.c
index 572e705c..60b35e5d 100644
--- a/tmux.c
+++ b/tmux.c
@@ -49,8 +49,8 @@ const char	*shell_command;
 static __dead void	 usage(void);
 static char		*make_label(const char *, char **);
 
+static int		 areshell(const char *);
 static const char	*getshell(void);
-static int		 checkshell(const char *);
 
 static __dead void
 usage(void)
@@ -79,7 +79,7 @@ getshell(void)
 	return (_PATH_BSHELL);
 }
 
-static int
+int
 checkshell(const char *shell)
 {
 	if (shell == NULL || *shell != '/')
@@ -91,7 +91,7 @@ checkshell(const char *shell)
 	return (1);
 }
 
-int
+static int
 areshell(const char *shell)
 {
 	const char	*progname, *ptr;
-- 
cgit v1.2.3