diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2009-11-08 22:59:53 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2009-11-08 22:59:53 +0000 |
| commit | cb0bf6a043377974bb40ace3c9782822c63b7ded (patch) | |
| tree | 508fe5da78811706ddb354c946d7c703bced4e4a /server-window.c | |
| parent | 971a7b2fe0d86c9e41bd0802997d20c61eeed2a3 (diff) | |
| download | rtmux-cb0bf6a043377974bb40ace3c9782822c63b7ded.tar.gz rtmux-cb0bf6a043377974bb40ace3c9782822c63b7ded.tar.bz2 rtmux-cb0bf6a043377974bb40ace3c9782822c63b7ded.zip | |
Sync OpenBSD patchset 496:
Switch window pane pipe redirect fd over to a bufferevent.
Diffstat (limited to 'server-window.c')
| -rw-r--r-- | server-window.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/server-window.c b/server-window.c index b4ebcf0a..6e2be037 100644 --- a/server-window.c +++ b/server-window.c @@ -1,4 +1,4 @@ -/* $Id: server-window.c,v 1.7 2009-11-08 22:58:37 tcunha Exp $ */ +/* $Id: server-window.c,v 1.8 2009-11-08 22:59:53 tcunha Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -55,16 +55,6 @@ server_window_prepare(void) event_set(&wp->event, wp->fd, events, server_window_callback, wp); event_add(&wp->event, NULL); - - if (wp->pipe_fd == -1) - continue; - events = 0; - if (BUFFER_USED(wp->pipe_buf) > 0) - events |= EV_WRITE; - event_del(&wp->pipe_event); - event_set(&wp->pipe_event, - wp->pipe_fd, events, server_window_callback, wp); - event_add(&wp->pipe_event, NULL); } } } @@ -110,14 +100,6 @@ server_window_callback(int fd, short events, void *data) } else window_pane_parse(wp); } - - if (fd == wp->pipe_fd) { - if (buffer_poll(fd, events, NULL, wp->pipe_buf) != 0) { - buffer_destroy(wp->pipe_buf); - close(wp->pipe_fd); - wp->pipe_fd = -1; - } - } } /* Window functions that need to happen every loop. */ |