X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fpoll.c;h=08e5d4671a6032edf14c63a6b5996e2d1a2b191e;hp=70679f6a5e8abb506689d63453812b12470373bb;hb=4437d37d1844243b154c4323413e18c50e3b8779;hpb=379504a233e3e2cc85bca1e7b6d864f1395aec7c diff --git a/src/poll.c b/src/poll.c index 70679f6..08e5d46 100644 --- a/src/poll.c +++ b/src/poll.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2009 Index Data + * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ /** @@ -63,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) @@ -84,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))