X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fpoll.c;h=08e5d4671a6032edf14c63a6b5996e2d1a2b191e;hb=4437d37d1844243b154c4323413e18c50e3b8779;hp=4c766058cdfb8b1681797aca8debf2b3134fd1f2;hpb=d67990f0801618bce56afe464b3492b6eb81b309;p=yaz-moved-to-github.git

diff --git a/src/poll.c b/src/poll.c
index 4c76605..08e5d46 100644
--- a/src/poll.c
+++ b/src/poll.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2010 Index Data
  * See the file LICENSE for details.
- *
- * $Id: poll.c,v 1.5 2008-01-21 13:09:07 adam Exp $
  */
 /**
  * \file 
@@ -65,6 +63,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;
 
+        /* Timeout events */
+        if (fd < 0)
+            continue;
+
         if (mask & yaz_poll_read)
             FD_SET(fd, &input);
         if (mask & yaz_poll_write)
@@ -86,8 +88,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))
@@ -165,6 +166,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