aboutsummaryrefslogtreecommitdiff
path: root/server-client.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2015-06-20 08:45:19 +0100
committerNicholas Marriott <nicholas.marriott@gmail.com>2015-06-20 08:45:19 +0100
commit8b8a007e8e1faa6af20acdeac728c4fddfeb2f6b (patch)
tree10612c9842dbdb0749e0840cf057ca4a08a84948 /server-client.c
parent8abcea18a24dea24d6049fefa31c877133489092 (diff)
parent0ef3e28609ba89f53bedf40f5facc990cc57e60d (diff)
downloadrtmux-8b8a007e8e1faa6af20acdeac728c4fddfeb2f6b.tar.gz
rtmux-8b8a007e8e1faa6af20acdeac728c4fddfeb2f6b.tar.bz2
rtmux-8b8a007e8e1faa6af20acdeac728c4fddfeb2f6b.zip
Merge branch 'master' of github.com:tmux/tmux
Diffstat (limited to 'server-client.c')
-rw-r--r--server-client.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/server-client.c b/server-client.c
index 27efc57d..c9c0c3ef 100644
--- a/server-client.c
+++ b/server-client.c
@@ -1053,6 +1053,7 @@ server_client_msg_dispatch(struct client *c)
case MSG_IDENTIFY_CWD:
case MSG_IDENTIFY_STDIN:
case MSG_IDENTIFY_ENVIRON:
+ case MSG_IDENTIFY_CLIENTPID:
case MSG_IDENTIFY_DONE:
server_client_msg_identify(c, &imsg);
break;
@@ -1227,6 +1228,11 @@ server_client_msg_identify(struct client *c, struct imsg *imsg)
if (strchr(data, '=') != NULL)
environ_put(&c->environ, data);
break;
+ case MSG_IDENTIFY_CLIENTPID:
+ if (datalen != sizeof c->pid)
+ fatalx("bad MSG_IDENTIFY_CLIENTPID size");
+ memcpy(&c->pid, data, sizeof c->pid);
+ break;
default:
break;
}