From 1f0b317088aaeb230d69f13f43ed63b7406c6fd1 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Sat, 5 Mar 2016 07:44:31 +0000
Subject: [PATCH 1/2] Although we always have en_US.UTF-8 on OpenBSD, some
 platforms do not, so fall back to setlocale(LC_CTYPE, ""). tmux requires a
 UTF-8 locale, so check with wcwidth() on a UTF-8 character after setlocale().

---
 tmux.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tmux.c b/tmux.c
index 93503d2d..d221c78e 100644
--- a/tmux.c
+++ b/tmux.c
@@ -188,9 +188,12 @@ main(int argc, char **argv)
 	const char	*s;
 	int		 opt, flags, keys;
 
-	setlocale(LC_CTYPE, "en_US.UTF-8");
-	setlocale(LC_TIME, "");
+	if (setlocale(LC_CTYPE, "en_US.UTF-8") == NULL)
+		setlocale(LC_CTYPE, "");
+	if (wcwidth(0xfffd) != 1)
+		errx(1, "no UTF-8 locale; please set LC_CTYPE");
 
+	setlocale(LC_TIME, "");
 	tzset();
 
 	if (**argv == '-')

From c38e0a4bbc722865f934db1282ca6f086874f530 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Sat, 5 Mar 2016 07:47:52 +0000
Subject: [PATCH 2/2] Do not use c->cwd or s->cwd if it is NULL, found by Ben
 Boeckel.

---
 cmd-load-buffer.c | 4 ++--
 cmd-new-session.c | 2 +-
 cmd-save-buffer.c | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cmd-load-buffer.c b/cmd-load-buffer.c
index 6fd2a767..de76b855 100644
--- a/cmd-load-buffer.c
+++ b/cmd-load-buffer.c
@@ -73,9 +73,9 @@ cmd_load_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
 		return (CMD_RETURN_WAIT);
 	}
 
-	if (c != NULL && c->session == NULL)
+	if (c != NULL && c->session == NULL && c->cwd != NULL)
 		cwd = c->cwd;
-	else if ((s = c->session) != NULL)
+	else if ((s = c->session) != NULL && s->cwd != NULL)
 		cwd = s->cwd;
 	else
 		cwd = ".";
diff --git a/cmd-new-session.c b/cmd-new-session.c
index 291107bc..357ffed1 100644
--- a/cmd-new-session.c
+++ b/cmd-new-session.c
@@ -142,7 +142,7 @@ cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq)
 		format_defaults(ft, c, NULL, NULL, NULL);
 		to_free = cwd = format_expand(ft, args_get(args, 'c'));
 		format_free(ft);
-	} else if (c != NULL && c->session == NULL)
+	} else if (c != NULL && c->session == NULL && c->cwd != NULL)
 		cwd = c->cwd;
 	else
 		cwd = ".";
diff --git a/cmd-save-buffer.c b/cmd-save-buffer.c
index 591390b5..3aaf8159 100644
--- a/cmd-save-buffer.c
+++ b/cmd-save-buffer.c
@@ -98,9 +98,9 @@ cmd_save_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
 		goto do_print;
 	}
 
-	if (c != NULL && c->session == NULL)
+	if (c != NULL && c->session == NULL && c->cwd != NULL)
 		cwd = c->cwd;
-	else if ((s = c->session) != NULL)
+	else if ((s = c->session) != NULL && s->cwd != NULL)
 		cwd = s->cwd;
 	else
 		cwd = ".";