summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2015-12-31 18:14:14 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2015-12-31 18:14:14 +0000
commit91a0c054c37f7d0d0b5113054a767c8d44d0b31b (patch)
tree0066f1e32f8f9d906d1732e8402d9c151213ff71
parentb20f2d1e5512a10874874d01eea09c5416ce26ca (diff)
Use saved pipe buffer offset when writing to pipe, from Nicolas Viennot.
-rw-r--r--usr.bin/tmux/window.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/tmux/window.c b/usr.bin/tmux/window.c
index 4afaf5d30d9..cb86fd38fee 100644
--- a/usr.bin/tmux/window.c
+++ b/usr.bin/tmux/window.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: window.c,v 1.154 2015/12/19 08:43:04 nicm Exp $ */
+/* $OpenBSD: window.c,v 1.155 2015/12/31 18:14:13 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -948,7 +948,7 @@ window_pane_read_callback(__unused struct bufferevent *bufev, void *data)
new_size = EVBUFFER_LENGTH(evb) - wp->pipe_off;
if (wp->pipe_fd != -1 && new_size > 0) {
- new_data = EVBUFFER_DATA(evb);
+ new_data = EVBUFFER_DATA(evb) + wp->pipe_off;
bufferevent_write(wp->pipe_event, new_data, new_size);
}