-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2012 Index Data
* See the file LICENSE for details.
- *
- * $Id: poll.c,v 1.4 2007-11-30 11:44:47 adam Exp $
*/
/**
* \file
* \brief Select, poll wrapper
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <assert.h>
#include <string.h>
enum yaz_poll_mask mask = fds[i].input_mask;
int fd = fds[i].fd;
+ /* Timeout events */
+ if (fd < 0)
+ continue;
+
if (mask & yaz_poll_read)
FD_SET(fd, &input);
if (mask & yaz_poll_write)
int fd = fds[i].fd;
if (!r)
yaz_poll_add(mask, yaz_poll_timeout);
- else
- {
+ else if (fd >= 0) {
if (FD_ISSET(fd, &input))
yaz_poll_add(mask, yaz_poll_read);
if (FD_ISSET(fd, &output))
yaz_poll_add(mask, yaz_poll_read);
if (pollfds[i].revents & POLLOUT)
yaz_poll_add(mask, yaz_poll_write);
- if (pollfds[i].revents & POLLERR)
+ if (pollfds[i].revents & ~(POLLIN | POLLOUT))
+ {
yaz_poll_add(mask, yaz_poll_except);
+ }
}
fds[i].output_mask = mask;
}
int yaz_poll(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
{
-#if YAZ_HAVE_SYS_POLL_H
+#if HAVE_SYS_POLL_H
return yaz_poll_poll(fds, num_fds, sec, nsec);
#else
return yaz_poll_select(fds, num_fds, sec, nsec);
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab