From: nicm <nicm@openbsd.org>
Date: Tue, 25 Apr 2017 14:46:23 +0000 (+0000)
Subject: Block the initial client if there is one until the configuration file
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=4e6168122272ba131535df81975cc63544d6a409;p=openbsd

Block the initial client if there is one until the configuration file
has finished loading.
---

diff --git a/usr.bin/tmux/cfg.c b/usr.bin/tmux/cfg.c
index e3b5389df45..b9f6ab06678 100644
--- a/usr.bin/tmux/cfg.c
+++ b/usr.bin/tmux/cfg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cfg.c,v 1.57 2017/04/21 14:04:54 nicm Exp $ */
+/* $OpenBSD: cfg.c,v 1.58 2017/04/25 14:46:23 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -28,10 +28,19 @@
 
 #include "tmux.h"
 
-static char	 *cfg_file;
-int		  cfg_finished;
-static char	**cfg_causes;
-static u_int	  cfg_ncauses;
+static char		 *cfg_file;
+int			  cfg_finished;
+static char		**cfg_causes;
+static u_int		  cfg_ncauses;
+static struct cmdq_item	 *cfg_item;
+
+static enum cmd_retval
+cfg_client_done(__unused struct cmdq_item *item, __unused void *data)
+{
+	if (!cfg_finished)
+		return (CMD_RETURN_WAIT);
+	return (CMD_RETURN_NORMAL);
+}
 
 static enum cmd_retval
 cfg_done(__unused struct cmdq_item *item, __unused void *data)
@@ -43,6 +52,9 @@ cfg_done(__unused struct cmdq_item *item, __unused void *data)
 	if (!RB_EMPTY(&sessions))
 		cfg_show_causes(RB_MIN(sessions, &sessions));
 
+	if (cfg_item != NULL)
+		cfg_item->flags &= ~CMDQ_WAITING;
+
 	status_prompt_load_history();
 
 	return (CMD_RETURN_NORMAL);
@@ -60,12 +72,24 @@ start_cfg(void)
 {
 	const char	*home;
 	int		 quiet = 0;
+	struct client	*c;
 
 	/*
-	 * Note that the configuration files are loaded without a client, so
-	 * NULL is passed into load_cfg() which means that commands run in the
-	 * global queue and item->client is NULL for all commands.
+	 * Configuration files are loaded without a client, so NULL is passed
+	 * into load_cfg() and commands run in the global queue with
+	 * item->client NULL.
+	 *
+	 * However, we must block the initial client (but just the initial
+	 * client) so that its command runs after the configuration is loaded.
+	 * Because start_cfg() is called so early, we can be sure the client's
+	 * command queue is currently empty and our callback will be at the
+	 * front - we need to get in before MSG_COMMAND.
 	 */
+	c = TAILQ_FIRST(&clients);
+	if (c != NULL) {
+		cfg_item = cmdq_get_callback(cfg_client_done, NULL);
+		cmdq_append(c, cfg_item);
+	}
 
 	load_cfg(TMUX_CONF, NULL, NULL, 1);