X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=server%2Feventl.c;h=cd5aa486f1f2b47f41d10e0430ff74b9a52d7294;hb=527e5237725b631a58124f9b0d7b5ce97c62a183;hp=46b2da042df796724e95be58bf95be6c7fe92d90;hpb=a309d6ece06c0ab732d98c59f2718efaebd01ec6;p=yaz-moved-to-github.git

diff --git a/server/eventl.c b/server/eventl.c
index 46b2da0..cd5aa48 100644
--- a/server/eventl.c
+++ b/server/eventl.c
@@ -4,7 +4,19 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: eventl.c,v $
- * Revision 1.18  1995-11-13 09:27:41  quinn
+ * Revision 1.22  1996-07-06 19:58:35  quinn
+ * System headerfiles gathered in yconfig
+ *
+ * Revision 1.21  1996/02/21  12:55:51  quinn
+ * small
+ *
+ * Revision 1.20  1996/02/21  12:52:55  quinn
+ * Test
+ *
+ * Revision 1.19  1995/12/05  11:17:30  quinn
+ * Moved some paranthesises around. Sigh.
+ *
+ * Revision 1.18  1995/11/13  09:27:41  quinn
  * Fiddling with the variant stuff.
  *
  * Revision 1.17  1995/11/07  12:37:44  quinn
@@ -61,17 +73,13 @@
  *
  */
 
+#include <yconfig.h>
 #include <stdio.h>
 #include <assert.h>
-#include <sys/time.h>
-#include <sys/types.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
-#ifdef _AIX
-#include <sys/select.h>
-#endif
 
 #include <eventl.h>
 
@@ -143,7 +151,8 @@ int event_loop()
 	    time_t now = time(0);
 
 	    p->force_event = 0;
-	    if (FD_ISSET(p->fd, &in) || force_event == EVENT_INPUT)
+	    if (!p->destroyed && (FD_ISSET(p->fd, &in) || force_event ==
+		EVENT_INPUT))
 	    {
 		p->last_event = now;
 	    	(*p->fun)(p, EVENT_INPUT);
@@ -160,8 +169,8 @@ int event_loop()
 		p->last_event = now;
 	    	(*p->fun)(p, EVENT_EXCEPT);
 	    }
-	    if (!p->destroyed && (p->max_idle && now - p->last_event >
-	    	p->max_idle) || force_event == EVENT_TIMEOUT)
+	    if (!p->destroyed && ((p->max_idle && now - p->last_event >
+	    	p->max_idle) || force_event == EVENT_TIMEOUT))
 	    {
 	    	p->last_event = now;
 	    	(*p->fun)(p, EVENT_TIMEOUT);