From 5ea6ccbb7f75b6a977fca0751ef0b81b18c375d1 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Mon, 10 May 2021 07:51:30 +0100
Subject: [PATCH] Do not expand the file given with -f so it can contain :s.

---
 tmux.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/tmux.c b/tmux.c
index 3a49c803..29921781 100644
--- a/tmux.c
+++ b/tmux.c
@@ -328,7 +328,7 @@ main(int argc, char **argv)
 	char					*path = NULL, *label = NULL;
 	char					*cause, **var;
 	const char				*s, *cwd;
-	int					 opt, keys, feat = 0;
+	int					 opt, keys, feat = 0, fflag = 0;
 	uint64_t				 flags = 0;
 	const struct options_table_entry	*oe;
 	u_int					 i;
@@ -373,10 +373,15 @@ main(int argc, char **argv)
 				flags |= CLIENT_CONTROL;
 			break;
 		case 'f':
-			for (i = 0; i < cfg_nfiles; i++)
-				free(cfg_files[i]);
-			free(cfg_files);
-			expand_paths(optarg, &cfg_files, &cfg_nfiles, 0);
+			if (!fflag) {
+				fflag = 1;
+				for (i = 0; i < cfg_nfiles; i++)
+					free(cfg_files[i]);
+				cfg_nfiles = 0;
+			}
+			cfg_files = xreallocarray(cfg_files, cfg_nfiles + 1,
+			    sizeof *cfg_files);
+			cfg_files[cfg_nfiles++] = xstrdup(optarg);
 			cfg_quiet = 0;
 			break;
  		case 'V':