diff options
Diffstat (limited to 'source3/lib/select.c')
| -rw-r--r-- | source3/lib/select.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/source3/lib/select.c b/source3/lib/select.c index f88ad52de6..550941ba77 100644 --- a/source3/lib/select.c +++ b/source3/lib/select.c @@ -1,6 +1,5 @@ /* - Unix SMB/Netbios implementation. - Version 3.0 + Unix SMB/CIFS implementation. Samba select/poll implementation Copyright (C) Andrew Tridgell 1992-1998 @@ -102,12 +101,6 @@ 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) { @@ -116,6 +109,18 @@ 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; } @@ -128,12 +133,10 @@ int sys_select_intr(int maxfd, fd_set *readfds, fd_set *writefds, fd_set *errorf { int ret; fd_set *readfds2, readfds_buf, *writefds2, writefds_buf, *errorfds2, errorfds_buf; - struct timeval tval2, *ptval; readfds2 = (readfds ? &readfds_buf : NULL); writefds2 = (writefds ? &writefds_buf : NULL); errorfds2 = (errorfds ? &errorfds_buf : NULL); - ptval = (tval ? &tval2 : NULL); do { if (readfds) @@ -142,10 +145,7 @@ int sys_select_intr(int maxfd, fd_set *readfds, fd_set *writefds, fd_set *errorf writefds_buf = *writefds; if (errorfds) errorfds_buf = *errorfds; - if (tval) - tval2 = *tval; - - ret = sys_select(maxfd, readfds2, writefds2, errorfds2, ptval); + ret = sys_select(maxfd, readfds2, writefds2, errorfds2, tval); } while (ret == -1 && errno == EINTR); if (readfds) |