summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/cmd-queue.c
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2015-11-14 09:41:06 +0000
committernicm <nicm@openbsd.org>2015-11-14 09:41:06 +0000
commiteb843181271518208beeb2dec3eee8b4282169e9 (patch)
tree57aa88611f9366f09abaa50f2c9c4b5552d44f79 /usr.bin/tmux/cmd-queue.c
parentknock out obsolete mlinks for srandom and urandom; (diff)
downloadwireguard-openbsd-eb843181271518208beeb2dec3eee8b4282169e9.tar.xz
wireguard-openbsd-eb843181271518208beeb2dec3eee8b4282169e9.zip
Push stdout and stderr to clients more aggressively, and add an event to
continue if the send fails.
Diffstat (limited to 'usr.bin/tmux/cmd-queue.c')
-rw-r--r--usr.bin/tmux/cmd-queue.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/tmux/cmd-queue.c b/usr.bin/tmux/cmd-queue.c
index c70ecab8825..ec94f839723 100644
--- a/usr.bin/tmux/cmd-queue.c
+++ b/usr.bin/tmux/cmd-queue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-queue.c,v 1.28 2015/11/12 11:10:50 nicm Exp $ */
+/* $OpenBSD: cmd-queue.c,v 1.29 2015/11/14 09:41:06 nicm Exp $ */
/*
* Copyright (c) 2013 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -85,7 +85,7 @@ cmdq_print(struct cmd_q *cmdq, const char *fmt, ...)
} else
evbuffer_add_vprintf(c->stdout_data, fmt, ap);
evbuffer_add(c->stdout_data, "\n", 1);
- server_push_stdout(c);
+ server_client_push_stdout(c);
} else {
w = c->session->curw->window;
if (w->active->mode != &window_copy_mode) {
@@ -125,7 +125,7 @@ cmdq_error(struct cmd_q *cmdq, const char *fmt, ...)
}
evbuffer_add(c->stderr_data, msg, msglen);
evbuffer_add(c->stderr_data, "\n", 1);
- server_push_stderr(c);
+ server_client_push_stderr(c);
c->retval = 1;
} else {
*msg = toupper((u_char) *msg);
@@ -146,7 +146,7 @@ cmdq_guard(struct cmd_q *cmdq, const char *guard, int flags)
evbuffer_add_printf(c->stdout_data, "%%%s %ld %u %d\n", guard,
(long) cmdq->time, cmdq->number, flags);
- server_push_stdout(c);
+ server_client_push_stdout(c);
}
/* Add command list to queue and begin processing if needed. */