From 3bf58aa17b4a9b9d636543b608c49a407f7fb938 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ren=C3=A9=20Berber?= Date: Tue, 15 Jun 2010 10:29:07 +0200 Subject: [PATCH] select: Correct timeout. --- ChangeLog | 5 +++++ lib/select.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4ad700df5..747e29d3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-06-15 René Berber (tiny change) + + select: Correct timeout. + * lib/select.c (rpl_select): Compute wait_timeout correctly. + 2010-06-14 Thien-Thi Nguyen (tiny change) git-version-gen: init shell var to avoid env var influence diff --git a/lib/select.c b/lib/select.c index 773689cf9..5677fdd47 100644 --- a/lib/select.c +++ b/lib/select.c @@ -246,7 +246,7 @@ rpl_select (int nfds, fd_set *rfds, fd_set *wfds, fd_set *xfds, wait_timeout = INFINITE; else { - wait_timeout = timeout->tv_sec + timeout->tv_usec / 1000; + wait_timeout = timeout->tv_sec * 1000 + timeout->tv_usec / 1000; /* select is also used as a portable usleep. */ if (!rfds && !wfds && !xfds) -- 2.11.0