Clean up io_input() for the "no input available" case

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

diff --git a/src/lib/empthread/io.c b/src/lib/empthread/io.c
index ef285a74c4a67f1104b8339e9e70a83e43527a88..0e65c86ed972da2c0d49d72fcbd58bcc54818eb4 100644 (file)
--- a/src/lib/empthread/io.c
+++ b/src/lib/empthread/io.c
@@ -108,7 +108,16 @@ io_open(int fd, int flags, int bufsize, struct timeval timeout)
 void
 io_close(struct iop *iop)
 {
-
+    char buf[IO_BUFSIZE];
+    int ret;
+
+    while (io_output(iop, 1) > 0) ;
+    shutdown(iop->fd, SHUT_WR);
+    while (empth_select(iop->fd, EMPTH_FD_READ, &iop->input_timeout) > 0) {
+       ret = read(iop->fd, buf, sizeof(buf));
+       if (ret <= 0)
+           break;
+    }
     if (iop->input)
        ioq_destroy(iop->input);
     if (iop->output)
@@ -119,9 +128,8 @@ io_close(struct iop *iop)
 
 /*
  * Return number of bytes read on success, zero on timeout, early
- * wakeup or EOF, -1 on error, with errno set appropriately.  In
- * particular, return -1 with errno set to EAGAIN or EWOULDBLOCK when
- * no data is available for non-blocking input (WAITFORINPUT false).
+ * wakeup or EOF, -1 on error.  In particular, return 0 when no data
+ * is available for non-blocking input (WAITFORINPUT false).
  * Use io_eof() to distinguish timeout and early wakeup from EOF.
  */
 int
@@ -131,14 +139,10 @@ io_input(struct iop *iop, int waitforinput)
     int cc;
     int res;
 
-    if ((iop->flags & IO_READ) == 0) {
-       errno = EBADF;
+    if ((iop->flags & IO_READ) == 0)
        return -1;
-    }
-    if (iop->flags & IO_ERROR) {
-       errno = EBADF;
+    if (iop->flags & IO_ERROR)
        return -1;
-    }
     if (iop->flags & IO_EOF)
        return 0;
 
@@ -155,9 +159,9 @@ io_input(struct iop *iop, int waitforinput)
     /* Do the actual read. */
     cc = read(iop->fd, buf, sizeof(buf));
     if (cc < 0) {
-       if (errno != EAGAIN && errno != EWOULDBLOCK)
-           /* Some form of file error occurred... */
-           iop->flags |= IO_ERROR;
+       if (errno == EAGAIN || errno == EWOULDBLOCK)
+           return 0;
+       iop->flags |= IO_ERROR;
        return -1;
     }
 
@@ -201,15 +205,15 @@ io_output(struct iop *iop, int wait)
     if (wait)
        ef_make_stale();
 
-    if (!ioq_qsize(iop->output))
-       return 0;
-
     if ((iop->flags & IO_WRITE) == 0)
        return -1;
 
     if (iop->flags & IO_ERROR)
        return -1;
 
+    if (!ioq_qsize(iop->output))
+       return 0;
+
     if (wait) {
        res = empth_select(iop->fd, EMPTH_FD_WRITE, NULL);
        if (res == 0)