fixed a bug in handling select in the main daemon - this stops the daemon spinning if a signal is received at an inconvenient moment

1 files changed, 6 insertions, 12 deletions

diff --git a/source/lib/select.c b/source/lib/select.c
index efcf63becca..f88ad52de65 100644
--- a/source/lib/select.c
+++ b/source/lib/select.c
@@ -102,6 +102,12 @@ int sys_select(int maxfd, fd_set *readfds, fd_set *writefds, fd_set *errorfds, s
 	}
 
 	if (FD_ISSET(select_pipe[0], readfds2)) {
+		char c;
+		saved_errno = errno;
+		if (read(select_pipe[0], &c, 1) == 1) {
+			pipe_read++;
+		}
+		errno = saved_errno;
 		FD_CLR(select_pipe[0], readfds2);
 		ret--;
 		if (ret == 0) {
@@ -110,18 +116,6 @@ int sys_select(int maxfd, fd_set *readfds, fd_set *writefds, fd_set *errorfds, s
 		}
 	}
 
-	saved_errno = errno;
-
-	while (pipe_written != pipe_read) {
-		char c;
-		/* Due to the linux kernel bug in 2.0.x, we
-		 * always increment here even if the read failed... */
-		read(select_pipe[0], &c, 1);
-		pipe_read++;
-	}
-
-	errno = saved_errno;
-
 	return ret;
 }