circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 09:26:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2020-06-10 10:01:20 +01:00
parent 8b673cc4f2 23d79cfda8
commit ea4425b9bd
5 changed files with 100 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
server-client.c
View File

@@ -55,9 +55,6 @@ static void server_client_dispatch_read_data(struct client *,
static void server_client_dispatch_read_done(struct client *,
struct imsg *);
/* Maximum data allowed to be held for a pane for a control client. */
#define SERVER_CLIENT_PANE_LIMIT 16777216
/* Compare client windows. */
static int
server_client_window_cmp(struct client_window *cw1,
@@ -1526,10 +1523,6 @@ server_client_check_pane_buffer(struct window_pane *wp)
log_debug("%s: %s has %zu bytes used and %zu left for %%%u",
__func__, c->name, wpo->used - wp->base_offset, new_size,
wp->id);
if (new_size > SERVER_CLIENT_PANE_LIMIT) {
control_discard(c);
c->flags |= CLIENT_EXIT;
}
if (wpo->used < minimum)
minimum = wpo->used;
}
@@ -1764,6 +1757,8 @@ server_client_check_exit(struct client *c)
{
struct client_file *cf;
const char *name = c->exit_session;
char *data;
size_t size, msize;
if (c->flags & (CLIENT_DEAD|CLIENT_EXITED))
return;
@@ -1786,7 +1781,17 @@ server_client_check_exit(struct client *c)
switch (c->exit_type) {
case CLIENT_EXIT_RETURN:
proc_send(c->peer, MSG_EXIT, -1, &c->retval, sizeof c->retval);
if (c->exit_message != NULL) {
msize = strlen(c->exit_message) + 1;
size = (sizeof c->retval) + msize;
} else
size = (sizeof c->retval);
data = xmalloc(size);
memcpy(data, &c->retval, sizeof c->retval);
if (c->exit_message != NULL)
memcpy(data + sizeof c->retval, c->exit_message, msize);
proc_send(c->peer, MSG_EXIT, -1, data, size);
free(data);
break;
case CLIENT_EXIT_SHUTDOWN:
proc_send(c->peer, MSG_SHUTDOWN, -1, NULL, 0);
@@ -1796,6 +1801,7 @@ server_client_check_exit(struct client *c)
break;
}
free(c->exit_session);
free(c->exit_message);
}
/* Redraw timer callback. */