mame	2008-06-30 22:30:11 +0900 (Mon, 30 Jun 2008)

  New Revision: 17739

  Modified files:
    trunk/ChangeLog
    trunk/ext/stringio/stringio.c

  Log:
    * ext/stringio/stringio.c (strio_getline): fix for nil and "" as
      separator.  [ruby-dev:34591]



  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=17739

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=17739&r2=17738&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ext/stringio/stringio.c?r1=17739&r2=17738&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 17738)
+++ ChangeLog	(revision 17739)
@@ -1,3 +1,8 @@
+Mon Jun 30 22:27:39 2008  Yusuke Endoh  <mame@t...>
+
+	* ext/stringio/stringio.c (strio_getline): fix for nil and "" as
+	  separator.  [ruby-dev:34591]
+
 Mon Jun 30 22:21:30 2008  Yusuke Endoh  <mame@t...>
 
 	* io.c (argf_each_line): pass args to each_line. [ruby-dev:34958]
Index: ext/stringio/stringio.c
===================================================================
--- ext/stringio/stringio.c	(revision 17738)
+++ ext/stringio/stringio.c	(revision 17739)
@@ -835,7 +835,7 @@
 		str = tmp;
 	    }
 	}
-	else {
+	else if (!NIL_P(str)) {
 	    StringValue(str);
 	}
     }
@@ -862,7 +862,7 @@
 	s = p;
 	while ((p = memchr(p, '\n', e - p)) && (p != e)) {
 	    if (*++p == '\n') {
-		e = p;
+		e = p + 1;
 		break;
 	    }
 	}

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