зеркало из https://github.com/github/ruby.git
* io.c (rb_io_external_encoding): should return the encoding of
the file reading. * io.c (rb_io_internal_encoding): should return the encoding of read string. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14542 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
7e237b9813
Коммит
5f9748deb7
|
@ -6,6 +6,12 @@ Mon Dec 24 02:06:35 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
|
|||
|
||||
* io.c (io_fwrite): wrong encoding destination.
|
||||
|
||||
* io.c (rb_io_external_encoding): should return the encoding of
|
||||
the file reading.
|
||||
|
||||
* io.c (rb_io_internal_encoding): should return the encoding of
|
||||
read string.
|
||||
|
||||
Mon Dec 24 01:46:43 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||
|
||||
* io.c (rb_io_s_pipe): allow specifying read-side encoding.
|
||||
|
|
5
io.c
5
io.c
|
@ -5848,6 +5848,9 @@ rb_io_external_encoding(VALUE io)
|
|||
rb_io_t *fptr;
|
||||
|
||||
GetOpenFile(io, fptr);
|
||||
if (fptr->enc2) {
|
||||
return rb_enc_from_encoding(fptr->enc2);
|
||||
}
|
||||
if (!fptr->enc && fptr->fd == 0) {
|
||||
fptr->enc = rb_default_external_encoding();
|
||||
}
|
||||
|
@ -5869,7 +5872,7 @@ rb_io_internal_encoding(VALUE io)
|
|||
|
||||
GetOpenFile(io, fptr);
|
||||
if (!fptr->enc2) return Qnil;
|
||||
return rb_enc_from_encoding(fptr->enc2);
|
||||
return rb_enc_from_encoding(fptr->enc);
|
||||
}
|
||||
|
||||
static VALUE
|
||||
|
|
Загрузка…
Ссылка в новой задаче