Sync OpenBSD patchset 993:

Allow $HOME as default-path in tmux.conf so the same config file can be used
on different machines regardless of where the user's home directory is.
ok nicm

1 files changed, 7 insertions, 0 deletions

diff --git a/cmd.c b/cmd.c
index aee095e6..85ae1dd2 100644
--- a/cmd.c
+++ b/cmd.c
@@ -1220,11 +1220,18 @@ cmd_get_default_path(struct cmd_ctx *ctx)
 	char			*cwd;
 	struct session		*s;
 	struct window_pane	*wp;
+	struct environ_entry	*envent;
 
 	if ((s = cmd_current_session(ctx, 0)) == NULL)
 		return (NULL);
 
 	cwd = options_get_string(&s->options, "default-path");
+	if ((cwd[0] == '~' && cwd[1] == '\0') || !strcmp(cwd, "$HOME")) {
+		envent = environ_find(&global_environ, "HOME");
+		if (envent != NULL && *envent->value != '\0')
+			return envent->value;
+		cwd = "";
+	}
 	if (*cwd == '\0') {
 		if (ctx->cmdclient != NULL && ctx->cmdclient->cwd != NULL)
 			return (ctx->cmdclient->cwd);