Hurd: fix timeout rounding in select

(cherry picked from commit 5a42321d438211210e0869e5e90f8d75d1354e14)

diff --git a/ChangeLog b/ChangeLog
index 833e55e1a9733c693b9ae988881d8030478b9ed5..50c75b6f0980f9a899a22e8038e25cf5c35e0f28 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-31  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+       * hurd/hurdselect.c (_hurd_select): Round timeout up instead of down
+       when converting to ms.
+
 2010-07-29  Roland McGrath  <roland@redhat.com>
 
        [BZ 11856]

diff --git a/hurd/hurdselect.c b/hurd/hurdselect.c
index 544eee9cb5ba2d93edc98a1b93c40daa1074fbd4..a7228f061188122a769b6803e99a084c2b35fb06 100644 (file)
--- a/hurd/hurdselect.c
+++ b/hurd/hurdselect.c
@@ -52,7 +52,7 @@ _hurd_select (int nfds,
   int firstfd, lastfd;
   mach_msg_timeout_t to = (timeout != NULL ?
                           (timeout->tv_sec * 1000 +
-                           timeout->tv_nsec / 1000000) :
+                           (timeout->tv_nsec + 999999) / 1000000) :
                           0);
   struct
     {