diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2013-10-20 17:28:44 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2013-10-20 17:28:44 +0000 |
| commit | 1448a873f1bd167ba0f78ab0f1f7d23b3c96d079 (patch) | |
| tree | 2b49f2ac97e842ea50ad2e51aa34de7ef735dfc7 /usr.bin/tmux/tmux.h | |
| parent | 07fdf45076fd0bbf9113cac691ff11bcecd4b6b7 (diff) | |
Do not run any command line command from the client which starts the
server until after the configuration file completes. This prevents it
racing against run-shell or if-shell in .tmux.conf that run in the
background.
Diffstat (limited to 'usr.bin/tmux/tmux.h')
| -rw-r--r-- | usr.bin/tmux/tmux.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h index 2993b2cc7e8..e05ade7eebd 100644 --- a/usr.bin/tmux/tmux.h +++ b/usr.bin/tmux/tmux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.h,v 1.430 2013/10/10 12:39:25 nicm Exp $ */ +/* $OpenBSD: tmux.h,v 1.431 2013/10/20 17:28:43 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -1510,6 +1510,7 @@ extern struct cmd_q *cfg_cmd_q; extern int cfg_finished; extern int cfg_references; extern struct causelist cfg_causes; +extern struct client *cfg_client; int load_cfg(const char *, struct cmd_q *, char **); void cfg_default_done(struct cmd_q *); void cfg_show_causes(struct session *); |