diff options
Diffstat (limited to 'usr.bin/tmux/buffer-poll.c')
| -rw-r--r-- | usr.bin/tmux/buffer-poll.c | 45 |
1 files changed, 1 insertions, 44 deletions
diff --git a/usr.bin/tmux/buffer-poll.c b/usr.bin/tmux/buffer-poll.c index dc6507a5e38..4e8109e0c9e 100644 --- a/usr.bin/tmux/buffer-poll.c +++ b/usr.bin/tmux/buffer-poll.c @@ -1,4 +1,4 @@ -/* $OpenBSD: buffer-poll.c,v 1.1 2009/06/01 22:58:49 nicm Exp $ */ +/* $OpenBSD: buffer-poll.c,v 1.2 2009/06/25 06:05:47 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -23,37 +23,17 @@ #include "tmux.h" -/* Set up pollfd for buffers. */ -void -buffer_set( - struct pollfd *pfd, int fd, unused struct buffer *in, struct buffer *out) -{ - pfd->fd = fd; - pfd->events = POLLIN; - if (BUFFER_USED(out) > 0) - pfd->events |= POLLOUT; -} - /* Fill buffers from socket based on poll results. */ int buffer_poll(struct pollfd *pfd, struct buffer *in, struct buffer *out) { ssize_t n; -#if 0 - log_debug("buffer_poll (%ld): fd=%d, revents=%d; out=%zu in=%zu", - (long) getpid(), - pfd->fd, pfd->revents, BUFFER_USED(out), BUFFER_USED(in)); -#endif - if (pfd->revents & (POLLERR|POLLNVAL|POLLHUP)) return (-1); if (pfd->revents & POLLIN) { buffer_ensure(in, BUFSIZ); n = read(pfd->fd, BUFFER_IN(in), BUFFER_FREE(in)); -#if 0 - log_debug("buffer_poll: fd=%d, read=%zd", pfd->fd, n); -#endif if (n == 0) return (-1); if (n == -1) { @@ -64,9 +44,6 @@ buffer_poll(struct pollfd *pfd, struct buffer *in, struct buffer *out) } if (BUFFER_USED(out) > 0 && pfd->revents & POLLOUT) { n = write(pfd->fd, BUFFER_OUT(out), BUFFER_USED(out)); -#if 0 - log_debug("buffer_poll: fd=%d, write=%zd", pfd->fd, n); -#endif if (n == -1) { if (errno != EINTR && errno != EAGAIN) return (-1); @@ -75,23 +52,3 @@ buffer_poll(struct pollfd *pfd, struct buffer *in, struct buffer *out) } return (0); } - -/* Flush buffer output to socket. */ -void -buffer_flush(int fd, struct buffer *in, struct buffer *out) -{ - struct pollfd pfd; - - while (BUFFER_USED(out) > 0) { - buffer_set(&pfd, fd, in, out); - - if (poll(&pfd, 1, INFTIM) == -1) { - if (errno == EAGAIN || errno == EINTR) - continue; - fatal("poll failed"); - } - - if (buffer_poll(&pfd, in, out) != 0) - break; - } -} |