X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fpoll.c;h=cbdd7543a857b6c2355f830a99e8a1b04c8de1ad;hb=57714653dbb646c4831568e35d9065dc54502346;hp=43f7993fd7edcc7039d8b775da60b6620781c203;hpb=2788a4851b551e1a3efb320a2878b809f2d8a9d7;p=yaz-moved-to-github.git

diff --git a/src/poll.c b/src/poll.c
index 43f7993..cbdd754 100644
--- a/src/poll.c
+++ b/src/poll.c
@@ -1,11 +1,14 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2009 Index Data
+ * Copyright (C) 1995-2012 Index Data
  * See the file LICENSE for details.
  */
 /**
  * \file 
  * \brief Select, poll wrapper
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <assert.h>
 #include <string.h>
@@ -57,12 +60,16 @@ int yaz_poll_select(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
     FD_ZERO(&output);
     FD_ZERO(&except);
 
-    assert(num_fds > 0);
+    assert(num_fds >= 0);
     for (i = 0; i < num_fds; i++)
     {
         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)
@@ -84,8 +91,7 @@ int yaz_poll_select(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
             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))
@@ -102,12 +108,13 @@ int yaz_poll_select(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
 #if HAVE_SYS_POLL_H
 int yaz_poll_poll(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
 {
-    int r;
-    struct pollfd *pollfds = (struct pollfd *) 
-        xmalloc(num_fds * sizeof *pollfds);
-    int i;
+    int i, r;
+    struct pollfd *pollfds = 0;
+
+    if (num_fds > 0)
+        pollfds = (struct pollfd *) xmalloc(num_fds * sizeof *pollfds);
 
-    assert(num_fds > 0);
+    assert(num_fds >= 0);
     for (i = 0; i < num_fds; i++)
     {
         enum yaz_poll_mask mask = fds[i].input_mask;
@@ -153,7 +160,7 @@ int yaz_poll_poll(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
 
 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);
@@ -163,6 +170,7 @@ int yaz_poll(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab