X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fpoll.c;h=833366ebfa831e742fefa6181843e43f464a5951;hp=4bd35c0170577d10280e48a38f02ce5b2d80837c;hb=8cb8947e3a7bff4dbf8f124871cb4905df1adce7;hpb=91c35d653aea231aff9efc3eef6a6ab6662dd129

diff --git a/src/poll.c b/src/poll.c
index 4bd35c0..833366e 100644
--- a/src/poll.c
+++ b/src/poll.c
@@ -1,13 +1,14 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
- *
- * $Id: poll.c,v 1.3 2007-11-10 08:59:31 adam Exp $
  */
 /**
- * \file 
+ * \file
  * \brief Select, poll wrapper
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <assert.h>
 #include <string.h>
@@ -59,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)
@@ -76,24 +81,23 @@ int yaz_poll_select(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
     }
     tv.tv_sec = sec;
     tv.tv_usec = nsec / 1000;
-    
+
     r = select(max_fd+1, &input, &output, &except, (sec == -1 ? 0 : &tv));
     if (r >= 0)
     {
         for (i = 0; i < num_fds; i++)
         {
-            enum yaz_poll_mask mask = 0;
+            enum yaz_poll_mask mask = yaz_poll_none;
             int fd = fds[i].fd;
             if (!r)
-                mask += yaz_poll_timeout;
-            else
-            {
+                yaz_poll_add(mask, yaz_poll_timeout);
+            else if (fd >= 0) {
                 if (FD_ISSET(fd, &input))
-                    mask += yaz_poll_read;
+                    yaz_poll_add(mask, yaz_poll_read);
                 if (FD_ISSET(fd, &output))
-                    mask += yaz_poll_write;
+                    yaz_poll_add(mask, yaz_poll_write);
                 if (FD_ISSET(fd, &except))
-                    mask += yaz_poll_except;
+                    yaz_poll_add(mask, yaz_poll_except);
             }
             fds[i].output_mask = mask;
         }
@@ -104,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;
 
-    assert(num_fds > 0);
+    if (num_fds > 0)
+        pollfds = (struct pollfd *) xmalloc(num_fds * sizeof *pollfds);
+
+    assert(num_fds >= 0);
     for (i = 0; i < num_fds; i++)
     {
         enum yaz_poll_mask mask = fds[i].input_mask;
@@ -131,17 +136,19 @@ int yaz_poll_poll(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
     {
         for (i = 0; i < num_fds; i++)
         {
-            enum yaz_poll_mask mask = 0;
+            enum yaz_poll_mask mask = yaz_poll_none;
             if (!r)
-                mask += yaz_poll_timeout;
+                yaz_poll_add(mask, yaz_poll_timeout);
             else
             {
                 if (pollfds[i].revents & POLLIN)
-                    mask += yaz_poll_read;
+                    yaz_poll_add(mask, yaz_poll_read);
                 if (pollfds[i].revents & POLLOUT)
-                    mask += yaz_poll_write;
-                if (pollfds[i].revents & POLLERR)
-                    mask += yaz_poll_except;
+                    yaz_poll_add(mask, yaz_poll_write);
+                if (pollfds[i].revents & ~(POLLIN | POLLOUT))
+                {
+                    yaz_poll_add(mask, yaz_poll_except);
+                }
             }
             fds[i].output_mask = 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