From 7c0408e181ce8b9b90d4a09fb780d2bf0ab96eff Mon Sep 17 00:00:00 2001 From: matz Date: Thu, 6 Sep 2007 15:30:49 +0000 Subject: * io.c (rb_io_getc): forgot to commit rb_enc_mbclen() fix. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13351 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ io.c | 2 +- version.h | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 558808353..b794f6555 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Sep 7 00:28:25 2007 Yukihiro Matsumoto + + * io.c (rb_io_getc): forgot to commit rb_enc_mbclen() fix. + Thu Sep 6 22:57:01 2007 Yukihiro Matsumoto * lib/fileutils.rb (FileUtils::Entry_::copy): prevent self copy of diff --git a/io.c b/io.c index cc086a8f9..b299689a3 100644 --- a/io.c +++ b/io.c @@ -2094,7 +2094,7 @@ rb_io_getc(VALUE io) if (io_fillbuf(fptr) < 0) { return Qnil; } - n = rb_enc_mbclen(fptr->rbuf+fptr->rbuf_off, enc); + n = rb_enc_mbclen(fptr->rbuf+fptr->rbuf_off, fptr->rbuf+fptr->rbuf_len, enc); if (n < fptr->rbuf_len) { str = rb_str_new(fptr->rbuf+fptr->rbuf_off, n); fptr->rbuf_off += n; diff --git a/version.h b/version.h index 389c0d4bc..af00af706 100644 --- a/version.h +++ b/version.h @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2007-09-06" +#define RUBY_RELEASE_DATE "2007-09-07" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20070906 +#define RUBY_RELEASE_CODE 20070907 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 9 -#define RUBY_RELEASE_DAY 6 +#define RUBY_RELEASE_DAY 7 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- cgit