Have the client pass its stdin fd to the server when identifying itself and

have the server use that rather than reopening the tty. If the fd isn't given,
use the old behaviour (so no need for a version change).

This allows tmux to be used as the shell, so also change so that when working
out the command to execute if default-command is empty (the default), tmux will
try not execute itself.

1 files changed, 15 insertions, 4 deletions

diff --git a/window.c b/window.c
index 3976d7cc..d24d789b 100644
--- a/window.c
+++ b/window.c
@@ -61,18 +61,29 @@ RB_GENERATE(winlinks, winlink, entry, winlink_cmp);
 const char *
 window_default_command(void)
 {
-	const char	*shell;
+	const char	*shell, *ptr;
 	struct passwd	*pw;
 
 	shell = getenv("SHELL");
 	if (shell != NULL && *shell != '\0')
-		return (shell);
+		goto found;
 
 	pw = getpwuid(getuid());
-	if (pw != NULL && pw->pw_shell != NULL && *pw->pw_shell != '\0')
-		return (pw->pw_shell);
+	if (pw != NULL && pw->pw_shell != NULL && *pw->pw_shell != '\0') {
+		shell = pw->pw_shell;
+		goto found;
+	}
 
 	return (_PATH_BSHELL);
+
+found:
+	if ((ptr = strrchr(shell, '/')) != NULL)
+		ptr++;
+	else
+		ptr = shell;
+	if (strcmp(ptr, __progname) == 0)
+		return (_PATH_BSHELL);
+	return (shell);
 }
 
 int