# HG changeset patch # User René Berber # Date 1276590547 -7200 # Node ID 4fc9e7002b1beaf5025408761af8e9117a60ec85 # Parent ba0385f65ed24b9e3416003a017a9b3188561407 select: Correct timeout. diff --git a/ChangeLog b/ChangeLog --- 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 --- a/lib/select.c +++ b/lib/select.c @@ -246,7 +246,7 @@ 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)