From 06b3f49c49897558d5692b5f0480107b769be361 Mon Sep 17 00:00:00 2001
From: Tiago Cunha <tcunha@gmx.com>
Date: Fri, 14 Aug 2009 21:28:00 +0000
Subject: Sync OpenBSD patchset 249:

When started as the shell, __progname contains a leading -, so hardcode "tmux"
for socket path and log files, and strip it when working out the shell.
---
 window.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'window.c')

diff --git a/window.c b/window.c
index 3d680149..5343479f 100644
--- a/window.c
+++ b/window.c
@@ -1,4 +1,4 @@
-/* $Id: window.c,v 1.101 2009-08-14 21:23:20 tcunha Exp $ */
+/* $Id: window.c,v 1.102 2009-08-14 21:28:00 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -60,6 +60,7 @@ const char *
 window_default_command(void)
 {
 	const char	*shell, *ptr;
+	char		*progname;
 	struct passwd	*pw;
 
 	shell = getenv("SHELL");
@@ -79,7 +80,10 @@ found:
 		ptr++;
 	else
 		ptr = shell;
-	if (strcmp(ptr, __progname) == 0)
+	progname = __progname;
+	if (*progname == '-')
+		progname++;
+	if (strcmp(ptr, progname) == 0)
 		return (_PATH_BSHELL);
 	return (shell);
 }
-- 
cgit