diff options
| author | Gerald Carter <jerry@samba.org> | 2002-06-17 18:36:36 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2002-06-17 18:36:36 +0000 |
| commit | 1e6e5b299c235b513095a76a4cd9fffc41e8fc9c (patch) | |
| tree | 9f741529073ad411cc7328334e26d3e35b1d33f1 /source/lib/select.c | |
| parent | a11c5d7ad07d259d764aede4745d13f8163a8212 (diff) | |
| download | samba-1e6e5b299c235b513095a76a4cd9fffc41e8fc9c.tar.gz samba-1e6e5b299c235b513095a76a4cd9fffc41e8fc9c.tar.xz samba-1e6e5b299c235b513095a76a4cd9fffc41e8fc9c.zip | |
beginning to sync up for 2.2.5 release....
Diffstat (limited to 'source/lib/select.c')
| -rw-r--r-- | source/lib/select.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/lib/select.c b/source/lib/select.c index f70268b7ce4..efcf63becca 100644 --- a/source/lib/select.c +++ b/source/lib/select.c @@ -134,10 +134,12 @@ 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) @@ -146,7 +148,10 @@ int sys_select_intr(int maxfd, fd_set *readfds, fd_set *writefds, fd_set *errorf writefds_buf = *writefds; if (errorfds) errorfds_buf = *errorfds; - ret = sys_select(maxfd, readfds2, writefds2, errorfds2, tval); + if (tval) + tval2 = *tval; + + ret = sys_select(maxfd, readfds2, writefds2, errorfds2, ptval); } while (ret == -1 && errno == EINTR); if (readfds) |