=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- src/usr.bin/tmux/window.c 2009/11/04 20:50:11 1.35 +++ src/usr.bin/tmux/window.c 2009/11/04 22:02:38 1.36 @@ -1,4 +1,4 @@ -/* $OpenBSD: window.c,v 1.35 2009/11/04 20:50:11 nicm Exp $ */ +/* $OpenBSD: window.c,v 1.36 2009/11/04 22:02:38 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -426,8 +426,8 @@ wp->sy = sy; wp->pipe_fd = -1; - wp->pipe_buf = NULL; wp->pipe_off = 0; + wp->pipe_event = NULL; wp->saved_grid = NULL; @@ -453,9 +453,8 @@ grid_destroy(wp->saved_grid); if (wp->pipe_fd != -1) { - buffer_destroy(wp->pipe_buf); close(wp->pipe_fd); - event_del(&wp->pipe_event); + bufferevent_free(wp->pipe_event); } buffer_destroy(wp->in); @@ -639,7 +638,7 @@ new_size = BUFFER_USED(wp->in) - wp->pipe_off; if (wp->pipe_fd != -1 && new_size > 0) - buffer_write(wp->pipe_buf, BUFFER_OUT(wp->in), new_size); + bufferevent_write(wp->pipe_event, BUFFER_OUT(wp->in), new_size); input_parse(wp);