X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=server%2Feventl.c;h=104088c9c080e581f80d68b38b22b3fadfa3c170;hb=6ea099611ad6b5eacd8abdc2d798f86d4adfbd12;hp=3d2df2fb343920029b55f28f2895892fe2b2e29d;hpb=0a3a8b6400167c2dfd6e6b5f135f6ad4783e554c;p=yaz-moved-to-github.git

diff --git a/server/eventl.c b/server/eventl.c
index 3d2df2f..104088c 100644
--- a/server/eventl.c
+++ b/server/eventl.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: eventl.c,v $
- * Revision 1.2  1995-03-14 10:27:59  quinn
+ * Revision 1.5  1995-03-15 08:37:41  quinn
+ * Now we're pretty much set for nonblocking I/O.
+ *
+ * Revision 1.4  1995/03/14  16:59:48  quinn
+ * Bug-fixes
+ *
+ * Revision 1.3  1995/03/14  11:30:14  quinn
+ * Works better now.
+ *
+ * Revision 1.2  1995/03/14  10:27:59  quinn
  * More work on demo server.
  *
  * Revision 1.1  1995/03/10  18:22:44  quinn
@@ -33,6 +42,7 @@ IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags)
     new->flags = flags;
     new->fun = cb;
     new->next = iochans;
+    new->force_event = 0;
     iochans = new;
     return new;
 }
@@ -51,6 +61,7 @@ int event_loop()
 	FD_ZERO(&out);
 	FD_ZERO(&except);
 	timeout = 0; /* hang on select */
+	max = 0;
     	for (p = iochans; p; p = p->next)
     	{
 	    if (p->force_event)
@@ -70,8 +81,6 @@ int event_loop()
 		continue;
 	    return 1;
 	}
-	if (!res)
-	    continue;
     	for (p = iochans; p; p = nextp)
     	{
 	    int force_event = p->force_event;
@@ -80,7 +89,7 @@ int event_loop()
 	    nextp = p->next;
 	    if (FD_ISSET(p->fd, &in) || force_event == EVENT_INPUT)
 	    	(*p->fun)(p, EVENT_INPUT);
-	    if (!p->destroyed && (FD_ISSET(p->fd, &in) ||
+	    if (!p->destroyed && (FD_ISSET(p->fd, &out) ||
 	   	 force_event == EVENT_OUTPUT))
 	    	(*p->fun)(p, EVENT_OUTPUT);
 	    if (!p->destroyed && (FD_ISSET(p->fd, &except) ||