From: Andrew Tridgell <tridge@samba.org> 
Date: Tue, 25 Jun 2002 00:59:14 +0000 (+0000)
Subject: fixed a bug in handling select in the main daemon - this stops the daemon spinning... 
X-Git-Tag: samba-3.0.0alpha18~148
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8d7dd523d897ea25a572c8f21903e94e8485404;p=thirdparty%2Fsamba.git

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

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;
 }