summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/server-client.c
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2020-03-31 17:14:40 +0000
committernicm <nicm@openbsd.org>2020-03-31 17:14:40 +0000
commitd6f6a5d22f7b4169161e9056890b99e32b72e5e9 (patch)
treec66b9cb6b86fed17382e1ca23270b11fc655c4eb /usr.bin/tmux/server-client.c
parentAdd a -T flag to resize-pane to trim lines below the cursor, moving (diff)
downloadwireguard-openbsd-d6f6a5d22f7b4169161e9056890b99e32b72e5e9.tar.xz
wireguard-openbsd-d6f6a5d22f7b4169161e9056890b99e32b72e5e9.zip
Add a way to mark environment variables as "hidden" so they can be used
by tmux but are not passed into the environment of new panes.
Diffstat (limited to 'usr.bin/tmux/server-client.c')
-rw-r--r--usr.bin/tmux/server-client.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/tmux/server-client.c b/usr.bin/tmux/server-client.c
index b58adc3c6ff..5d27c3fd81e 100644
--- a/usr.bin/tmux/server-client.c
+++ b/usr.bin/tmux/server-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server-client.c,v 1.311 2020/03/31 11:38:35 nicm Exp $ */
+/* $OpenBSD: server-client.c,v 1.312 2020/03/31 17:14:40 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -520,6 +520,7 @@ server_client_check_mouse(struct client *c, struct key_event *event)
memcpy(&c->click_event, m, sizeof c->click_event);
c->click_button = m->b;
+ log_debug("click timer started");
tv.tv_sec = KEYC_CLICK_TIMEOUT / 1000;
tv.tv_usec = (KEYC_CLICK_TIMEOUT % 1000) * 1000L;
evtimer_del(&c->click_timer);
@@ -2020,7 +2021,7 @@ server_client_dispatch_identify(struct client *c, struct imsg *imsg)
if (datalen == 0 || data[datalen - 1] != '\0')
fatalx("bad MSG_IDENTIFY_ENVIRON string");
if (strchr(data, '=') != NULL)
- environ_put(c->environ, data);
+ environ_put(c->environ, data, 0);
log_debug("client %p IDENTIFY_ENVIRON %s", c, data);
break;
case MSG_IDENTIFY_CLIENTPID: