diff options
| author | Thomas Adam <thomas@xteddy.org> | 2017-07-12 13:39:59 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2017-07-12 13:43:08 +0100 |
| commit | 1076a2e26c224d17c32a2d1770997d8718903f20 (patch) | |
| tree | 2a51f6e719b9cbff0e37d7a887e56992ffb875bd /server-client.c | |
| parent | fbbf5a108b01c742ca11e779845a4d19a1c5edd1 (diff) | |
| parent | 51112221eeb31ced907f0dfcf077582996c20c07 (diff) | |
| download | rtmux-1076a2e26c224d17c32a2d1770997d8718903f20.tar.gz rtmux-1076a2e26c224d17c32a2d1770997d8718903f20.tar.bz2 rtmux-1076a2e26c224d17c32a2d1770997d8718903f20.zip | |
Merge branch 'obsd-master'
Conflicts:
cmd-pipe-pane.c
proc.c
tmux.c
window.c
Diffstat (limited to 'server-client.c')
| -rw-r--r-- | server-client.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server-client.c b/server-client.c index 1fd6eb6c..338ae70d 100644 --- a/server-client.c +++ b/server-client.c @@ -369,7 +369,7 @@ server_client_detach(struct client *c, enum msgtype msgtype) c->flags |= CLIENT_DETACHING; notify_client("client-detached", c); - proc_send_s(c->peer, msgtype, s->name); + proc_send(c->peer, msgtype, -1, s->name, strlen(s->name) + 1); } /* Execute command to replace a client. */ @@ -1735,7 +1735,7 @@ server_client_dispatch_shell(struct client *c) shell = options_get_string(global_s_options, "default-shell"); if (*shell == '\0' || areshell(shell)) shell = _PATH_BSHELL; - proc_send_s(c->peer, MSG_SHELL, shell); + proc_send(c->peer, MSG_SHELL, -1, shell, strlen(shell) + 1); proc_kill_peer(c->peer); } |