diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | io.c | 6 | ||||
| -rw-r--r-- | lib/rubygems/package.rb | 2 | ||||
| -rw-r--r-- | lib/xsd/charset.rb | 2 |
4 files changed, 14 insertions, 4 deletions
@@ -1,3 +1,11 @@ +Thu Dec 13 08:56:01 2007 Yukihiro Matsumoto <matz@ruby-lang.org> + + * io.c (rb_io_getc): use default external encoding if fptr->enc is + not set. [ruby-dev:32565] + + * lib/rubygems/package.rb (Gem::TarReader::Entry::rewind): typo fixed. + [ruby-dev:32565] + Thu Dec 13 08:24:16 2007 Yukihiro Matsumoto <matz@ruby-lang.org> * io.c (read_all): should associate default external encoding. @@ -2132,15 +2132,17 @@ rb_io_getc(VALUE io) rb_io_t *fptr; int r, n; VALUE str; + rb_encoding *enc; GetOpenFile(io, fptr); rb_io_check_readable(fptr); + enc = fptr->enc ? fptr->enc : rb_default_external_encoding(); READ_CHECK(fptr); if (io_fillbuf(fptr) < 0) { return Qnil; } - r = rb_enc_precise_mbclen(fptr->rbuf+fptr->rbuf_off, fptr->rbuf+fptr->rbuf_off+fptr->rbuf_len, fptr->enc); + r = rb_enc_precise_mbclen(fptr->rbuf+fptr->rbuf_off, fptr->rbuf+fptr->rbuf_off+fptr->rbuf_len, enc); if ((n = MBCLEN_CHARFOUND(r)) != 0 && n <= fptr->rbuf_len) { str = rb_str_new(fptr->rbuf+fptr->rbuf_off, n); fptr->rbuf_off += n; @@ -2154,7 +2156,7 @@ getc_needmore: rb_str_cat(str, fptr->rbuf+fptr->rbuf_off, 1); fptr->rbuf_off++; fptr->rbuf_len--; - r = rb_enc_precise_mbclen(RSTRING_PTR(str), RSTRING_PTR(str)+RSTRING_LEN(str), fptr->enc); + r = rb_enc_precise_mbclen(RSTRING_PTR(str), RSTRING_PTR(str)+RSTRING_LEN(str), enc); if (MBCLEN_NEEDMORE(r)) { goto getc_needmore; } diff --git a/lib/rubygems/package.rb b/lib/rubygems/package.rb index fd75d188bd..b613b7fa05 100644 --- a/lib/rubygems/package.rb +++ b/lib/rubygems/package.rb @@ -379,7 +379,7 @@ module Gem::Package end alias_method :is_directory, :is_directory? - alias_method :is_file, :is_file + alias_method :is_file, :is_file? def bytes_read @read diff --git a/lib/xsd/charset.rb b/lib/xsd/charset.rb index 15d5500fce..cd4d8a074c 100644 --- a/lib/xsd/charset.rb +++ b/lib/xsd/charset.rb @@ -10,7 +10,7 @@ module XSD module Charset - @internal_encoding = $KCODE + @internal_encoding = "ASCII" class XSDError < StandardError; end class CharsetError < XSDError; end |