[sleepy.penguin] [PATCH 12/17] kqueue/io: fix MRI 1.8 support code for event retrieval

[Eric Wong <normalperson@yhbt.net>]

First off, the timeout is not handled properly when timing out,
resulting in an infinite loop.

Secondly, arguments were not passed to the yielded block correctly.

Finally, the return value of kevent was not returned correctly to
the caller.
---
 lib/sleepy_penguin/kqueue/io.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/sleepy_penguin/kqueue/io.rb b/lib/sleepy_penguin/kqueue/io.rb
index 1e5809d..15502d4 100644
--- a/lib/sleepy_penguin/kqueue/io.rb
+++ b/lib/sleepy_penguin/kqueue/io.rb
@@ -15,11 +15,12 @@ def kevent(changelist = nil, nevents = nil, timeout = nil)
       expire_at = timeout ? Time.now + timeout : nil
       begin
         IO.select([self], nil, nil, timeout)
-        n = __kevent(changelist, nevents, 0) do |a,b,c,d,e,f|
-          yield a, b, c, d, e
+        n = __kevent(changelist, nevents, 0) do |*args|
+          yield(*args)
         end
-      end while n == 0 &&
+      end while n == 0 && timeout != 0 &&
                 (expire_at == nil || timeout = __update_timeout(expire_at))
+      n
     else
       # nevents should be zero or nil here
       __kevent(changelist, nevents, 0)
-- 
1.8.2.1.367.gc875ca7