kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* io.c (argf_next_argv, argf_set_encoding): copy struct wise.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19115 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-09-04 01:33:47 +00:00
parent 31b054122c
commit 747d9b3925
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Thu Sep 4 10:33:43 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (argf_next_argv, argf_set_encoding): copy struct wise.
Thu Sep 4 09:46:18 2008 Tanaka Akira <akr@fsij.org> Thu Sep 4 09:46:18 2008 Tanaka Akira <akr@fsij.org>
* io.c (rb_scan_open_args): follow rb_str_transcode change. * io.c (rb_scan_open_args): follow rb_str_transcode change.

10
io.c
View file

@ -5883,10 +5883,7 @@ argf_next_argv(VALUE argf)
rb_io_t *fptr; rb_io_t *fptr;
GetOpenFile(current_file, fptr); GetOpenFile(current_file, fptr);
fptr->encs.enc = argf_enc; fptr->encs = ARGF.encs;
fptr->encs.enc2 = argf_enc2;
fptr->encs.flags = argf_ecflags;
fptr->encs.ecopts = argf_ecopts;
clear_codeconv(fptr); clear_codeconv(fptr);
} }
} }
@ -7563,10 +7560,7 @@ argf_set_encoding(int argc, VALUE *argv, VALUE argf)
} }
rb_io_set_encoding(argc, argv, current_file); rb_io_set_encoding(argc, argv, current_file);
GetOpenFile(current_file, fptr); GetOpenFile(current_file, fptr);
argf_enc = fptr->encs.enc; ARGF.encs = fptr->encs;
argf_enc2 = fptr->encs.enc2;
argf_ecflags = fptr->encs.flags;
argf_ecopts = fptr->encs.ecopts;
return argf; return argf;
} }