nobu	2008-06-14 22:52:41 +0900 (Sat, 14 Jun 2008)

  New Revision: 17162

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/ext/stringio/stringio.c
    branches/ruby_1_8/version.h
    trunk/ChangeLog
    trunk/ext/stringio/stringio.c

  Log:
    * ext/stringio/stringio.c (strio_sysread): should not raise at empty
      read.  a patch from Arthur Schreiber at [ruby-core:17245].


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=17162&r2=17161&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=17162&r2=17161&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ext/stringio/stringio.c?r1=17162&r2=17161&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ext/stringio/stringio.c?r1=17162&r2=17161&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/version.h?r1=17162&r2=17161&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 17161)
+++ ChangeLog	(revision 17162)
@@ -1,3 +1,8 @@
+Sat Jun 14 22:52:35 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/stringio/stringio.c (strio_sysread): should not raise at empty
+	  read.  a patch from Arthur Schreiber at [ruby-core:17245].
+
 Sat Jun 14 16:55:46 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* file.c (file_expand_path): no need to expand root path which has no
Index: ext/stringio/stringio.c
===================================================================
--- ext/stringio/stringio.c	(revision 17161)
+++ ext/stringio/stringio.c	(revision 17162)
@@ -1152,7 +1152,7 @@
 strio_sysread(int argc, VALUE *argv, VALUE self)
 {
     VALUE val = strio_read(argc, argv, self);
-    if (NIL_P(val) || RSTRING_LEN(val) == 0) {
+    if (NIL_P(val)) {
 	rb_eof_error();
     }
     return val;
Index: ruby_1_8/ext/stringio/stringio.c
===================================================================
--- ruby_1_8/ext/stringio/stringio.c	(revision 17161)
+++ ruby_1_8/ext/stringio/stringio.c	(revision 17162)
@@ -1230,7 +1230,7 @@
     VALUE self;
 {
     VALUE val = strio_read(argc, argv, self);
-    if (NIL_P(val) || RSTRING(val)->len == 0) {
+    if (NIL_P(val)) {
 	rb_eof_error();
     }
     return val;
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 17161)
+++ ruby_1_8/ChangeLog	(revision 17162)
@@ -1,3 +1,8 @@
+Sat Jun 14 22:52:35 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/stringio/stringio.c (strio_sysread): should not raise at empty
+	  read.  a patch from Arthur Schreiber at [ruby-core:17245].
+
 Sat Jun 14 22:16:09 2008  Akinori MUSHA  <knu@i...>
 
 	* configure.in: Fix $LOAD_PATH.  Properly expand vendor_ruby
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 17161)
+++ ruby_1_8/version.h	(revision 17162)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2008-06-13"
+#define RUBY_RELEASE_DATE "2008-06-14"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20080613
+#define RUBY_RELEASE_CODE 20080614
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 13
+#define RUBY_RELEASE_DAY 14
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/