From: René Berber <r.berber@computer.org>
Date: Tue, 15 Jun 2010 08:29:07 +0000 (+0200)
Subject: select: Correct timeout.
X-Git-Tag: v0.1~4063
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=3bf58aa17b4a9b9d636543b608c49a407f7fb938;p=gnulib.git

select: Correct timeout.
---

diff --git a/ChangeLog b/ChangeLog
index 4ad700df5..747e29d3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-15  René Berber  <r.berber@computer.org>  (tiny change)
+
+	select: Correct timeout.
+	* lib/select.c (rpl_select): Compute wait_timeout correctly.
+
 2010-06-14  Thien-Thi Nguyen  <ttn@gnuvola.org>  (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)