Fix empth_select() for funny flag arguments

[empserver] / src / lib / empthread / pthread.c

diff --git a/src/lib/empthread/pthread.c b/src/lib/empthread/pthread.c
index 854e03264bb6bf79789361431727e7eb7b7d5807..7df1934d74991f4f58013c236a0e8a293c5d2dee 100644 (file)
--- a/src/lib/empthread/pthread.c
+++ b/src/lib/empthread/pthread.c
@@ -26,7 +26,7 @@
  *  ---
  *
  *  pthread.c: Interface from Empire threads to POSIX threads
- * 
+ *
  *  Known contributors to this file:
  *     Sasha Mikheev
  *     Steve McClure, 1998
@@ -289,65 +289,51 @@ empth_terminate(empth_t *a)
     pthread_kill(a->id, SIGALRM);
 }
 
-void
-empth_select(int fd, int flags)
+int
+empth_select(int fd, int flags, struct timeval *timeout)
 {
-
     fd_set readmask;
     fd_set writemask;
     struct timeval tv;
     int n;
+    int res = 0;
 
     pthread_mutex_unlock(&mtx_ctxsw);
-    empth_status("%s select on %d",
-                flags == EMPTH_FD_READ ? "read" : "write", fd);
-    while (1) {
-       tv.tv_sec = 1000000;
-       tv.tv_usec = 0;
-
-       FD_ZERO(&readmask);
-       FD_ZERO(&writemask);
-
-       switch (flags) {
-       case EMPTH_FD_READ:
-           FD_SET(fd, &readmask);
-           break;
-       case EMPTH_FD_WRITE:
-           FD_SET(fd, &writemask);
-           break;
-       default:
-           logerror("bad flag %d passed to empth_select", flags);
-           empth_exit();
-       }
-
-       n = select(fd + 1, &readmask, &writemask, (fd_set *) 0, &tv);
+    empth_status("select on %d for %d", fd, flags);
+
+    FD_ZERO(&readmask);
+    FD_ZERO(&writemask);
+    if (flags & EMPTH_FD_READ)
+       FD_SET(fd, &readmask);
+    if (flags & EMPTH_FD_WRITE)
+       FD_SET(fd, &writemask);
+
+    if (timeout) {
+       tv = *timeout;
+       timeout = &tv;
+    }
+    n = select(fd + 1, &readmask, &writemask, NULL, timeout);
 
-       if (n < 0) {
-           if (errno == EINTR) {
-               /* go handle the signal */
-               empth_status("select broken by signal");
-               goto done;
-               return;
-           }
-           /* strange but we dont get EINTR on select broken by signal */
+    if (n < 0) {
+       if (errno == EINTR) /* go handle the signal */
+           empth_status("select broken by signal");
+        else
            empth_status("select failed (%s)", strerror(errno));
-           goto done;
-           return;
-       }
-
-       if (flags == EMPTH_FD_READ && FD_ISSET(fd, &readmask)) {
-           empth_status("input ready");
-           break;
-       }
-       if (flags == EMPTH_FD_WRITE && FD_ISSET(fd, &writemask)) {
-           empth_status("output ready");
-           break;
-       }
+       res = -1;
+    } else if (n == 0) {
+       empth_status("select timed out");
+       res = 0;
+    } else if (flags == EMPTH_FD_READ && FD_ISSET(fd, &readmask)) {
+       empth_status("input ready");
+       res = 1;
+    } else if (flags == EMPTH_FD_WRITE && FD_ISSET(fd, &writemask)) {
+       empth_status("output ready");
+       res = 1;
     }
 
-  done:
     pthread_mutex_lock(&mtx_ctxsw);
     empth_restorectx();
+    return res;
 }
 
 static void