kgio 1.3.0 → 1.3.0.1.gd225

data/ChangeLog

@@ -1,5 +1,13 @@
 ChangeLog from git://git.bogomips.org/kgio.git ()
 
+    commit d225ede82d820d045bd7cfb826f444cf6601577c
+    Author: Eric Wong <normalperson@yhbt.net>
+    Date:   Fri Oct 8 02:53:38 2010 -0700
+    
+        return empty string on length=0
+        
+        This matches behavior of all the core Ruby methods.
+    
     commit e4599227f0da0f652cbcb52838e631d7384dcd0d
     Author: Eric Wong <e@yhbt.net>
     Date:   Thu Oct 7 20:02:40 2010 -0700

data/GIT-VERSION-FILE

@@ -1 +1 @@
-GIT_VERSION = 1.3.0
+GIT_VERSION = 1.3.0.1.gd225

data/ext/kgio/read_write.c

@@ -92,11 +92,14 @@ static VALUE my_read(int io_wait, int argc, VALUE *argv, VALUE io)
 	long n;
 
 	prepare_read(&a, argc, argv, io);
-	set_nonblocking(a.fd);
+
+	if (a.len > 0) {
+		set_nonblocking(a.fd);
 retry:
-	n = (long)read(a.fd, a.ptr, a.len);
-	if (read_check(&a, n, "read", io_wait) != 0)
-		goto retry;
+		n = (long)read(a.fd, a.ptr, a.len);
+		if (read_check(&a, n, "read", io_wait) != 0)
+			goto retry;
+	}
 	return a.buf;
 }
 
@@ -159,10 +162,13 @@ static VALUE my_recv(int io_wait, int argc, VALUE *argv, VALUE io)
 	long n;
 
 	prepare_read(&a, argc, argv, io);
+
+	if (a.len > 0) {
 retry:
-	n = (long)recv(a.fd, a.ptr, a.len, MSG_DONTWAIT);
-	if (read_check(&a, n, "recv", io_wait) != 0)
-		goto retry;
+		n = (long)recv(a.fd, a.ptr, a.len, MSG_DONTWAIT);
+		if (read_check(&a, n, "recv", io_wait) != 0)
+			goto retry;
+	}
 	return a.buf;
 }
 

data/test/lib_read_write.rb

@@ -18,6 +18,20 @@ module LibReadWriteTest
     end
   end
 
+  def test_read_zero
+    assert_equal "", @rd.kgio_read(0)
+    buf = "foo"
+    assert_equal buf.object_id, @rd.kgio_read(0, buf).object_id
+    assert_equal "", buf
+  end
+
+  def test_tryread_zero
+    assert_equal "", @rd.kgio_tryread(0)
+    buf = "foo"
+    assert_equal buf.object_id, @rd.kgio_tryread(0, buf).object_id
+    assert_equal "", buf
+  end
+
   def test_read_eof
     @wr.close
     assert_nil @rd.kgio_read(5)

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: kgio
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 375488223
+  prerelease: true
   segments: 
   - 1
   - 3
   - 0
-  version: 1.3.0
+  - 1
+  - gd225
+  version: 1.3.0.1.gd225
 platform: ruby
 authors: 
 - kgio hackers
@@ -112,12 +114,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: rainbows