sockets: fix for whether poll is available

[yaz-moved-to-github.git] / src / poll.c

diff --git a/src/poll.c b/src/poll.c
index 4bd35c0..f3584d7 100644 (file)
--- 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) 1995-2011 Index Data

  * See the file LICENSE for details.
  * See the file LICENSE for details.

- *
- * $Id: poll.c,v 1.3 2007-11-10 08:59:31 adam Exp $

  */
 /**
  * \file 
  * \brief Select, poll wrapper
  */
  */
 /**
  * \file 
  * \brief Select, poll wrapper
  */

+#if HAVE_CONFIG_H
+#include <config.h>
+#endif

 
 #include <assert.h>
 #include <string.h>
 
 #include <assert.h>
 #include <string.h>

@@ -65,6 +66,10 @@ int yaz_poll_select(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
         enum yaz_poll_mask mask = fds[i].input_mask;
         int fd = fds[i].fd;
 
         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)
         if (mask & yaz_poll_read)
             FD_SET(fd, &input);
         if (mask & yaz_poll_write)

@@ -82,18 +87,17 @@ int yaz_poll_select(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
     {
         for (i = 0; i < num_fds; i++)
         {
     {
         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)
             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))
                 if (FD_ISSET(fd, &input))

-                    mask += yaz_poll_read;
+                    yaz_poll_add(mask, yaz_poll_read);

                 if (FD_ISSET(fd, &output))
                 if (FD_ISSET(fd, &output))

-                    mask += yaz_poll_write;
+                    yaz_poll_add(mask, yaz_poll_write);

                 if (FD_ISSET(fd, &except))
                 if (FD_ISSET(fd, &except))

-                    mask += yaz_poll_except;
+                    yaz_poll_add(mask, yaz_poll_except);

             }
             fds[i].output_mask = mask;
         }
             }
             fds[i].output_mask = mask;
         }

@@ -131,17 +135,19 @@ int yaz_poll_poll(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
     {
         for (i = 0; i < num_fds; i++)
         {
     {
         for (i = 0; i < num_fds; i++)
         {

-            enum yaz_poll_mask mask = 0;
+            enum yaz_poll_mask mask = yaz_poll_none;

             if (!r)
             if (!r)

-                mask += yaz_poll_timeout;
+                yaz_poll_add(mask, yaz_poll_timeout);

             else
             {
                 if (pollfds[i].revents & POLLIN)
             else
             {
                 if (pollfds[i].revents & POLLIN)

-                    mask += yaz_poll_read;
+                    yaz_poll_add(mask, yaz_poll_read);

                 if (pollfds[i].revents & POLLOUT)
                 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;
         }
             }
             fds[i].output_mask = mask;
         }

@@ -153,7 +159,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)
 {
 
 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);
     return yaz_poll_poll(fds, num_fds, sec, nsec);
 #else
     return yaz_poll_select(fds, num_fds, sec, nsec);

@@ -163,6 +169,7 @@ int yaz_poll(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
 /*
  * Local variables:
  * c-basic-offset: 4
 /*
  * Local variables:
  * c-basic-offset: 4

+ * c-file-style: "Stroustrup"

  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab