From 35591ecd4eccb96bb1c34909f3f463b09f1db7db Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Wed, 7 Nov 2007 19:41:17 +0000 Subject: Try write even if read gets signal, some other tweaks. --- buffer-poll.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'buffer-poll.c') diff --git a/buffer-poll.c b/buffer-poll.c index e3c64832..06cbf81f 100644 --- a/buffer-poll.c +++ b/buffer-poll.c @@ -1,4 +1,4 @@ -/* $Id: buffer-poll.c,v 1.1.1.1 2007-07-09 19:04:12 nicm Exp $ */ +/* $Id: buffer-poll.c,v 1.2 2007-11-07 19:41:17 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -40,18 +40,16 @@ buffer_poll(struct pollfd *pfd, struct buffer *in, struct buffer *out) if (n == -1) { if (errno != EINTR && errno != EAGAIN) return (-1); - return (0); - } - buffer_add(in, n); + } else + buffer_add(in, n); } if (BUFFER_USED(out) > 0 && pfd->revents & POLLOUT) { n = write(pfd->fd, BUFFER_OUT(out), BUFFER_USED(out)); if (n == -1) { if (errno != EINTR && errno != EAGAIN) return (-1); - return (0); - } - buffer_remove(out, n); + } else + buffer_remove(out, n); } return (0); } -- cgit