diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-04 01:33:47 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-04 01:33:47 +0000 |
commit | 26afc1a2318479d3951736b9280817c9bcd3fac9 (patch) | |
tree | 69762d64a2ca918e0f27afc4c713fd289ae7516c | |
parent | 9914ee8157591393a4098ff9e96bce578d952365 (diff) | |
download | ruby-26afc1a2318479d3951736b9280817c9bcd3fac9.tar.gz ruby-26afc1a2318479d3951736b9280817c9bcd3fac9.tar.xz ruby-26afc1a2318479d3951736b9280817c9bcd3fac9.zip |
* io.c (argf_next_argv, argf_set_encoding): copy struct wise.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19115 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | io.c | 10 |
2 files changed, 6 insertions, 8 deletions
@@ -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> * io.c (rb_scan_open_args): follow rb_str_transcode change. @@ -5883,10 +5883,7 @@ argf_next_argv(VALUE argf) rb_io_t *fptr; GetOpenFile(current_file, fptr); - fptr->encs.enc = argf_enc; - fptr->encs.enc2 = argf_enc2; - fptr->encs.flags = argf_ecflags; - fptr->encs.ecopts = argf_ecopts; + fptr->encs = ARGF.encs; clear_codeconv(fptr); } } @@ -7563,10 +7560,7 @@ argf_set_encoding(int argc, VALUE *argv, VALUE argf) } rb_io_set_encoding(argc, argv, current_file); GetOpenFile(current_file, fptr); - argf_enc = fptr->encs.enc; - argf_enc2 = fptr->encs.enc2; - argf_ecflags = fptr->encs.flags; - argf_ecopts = fptr->encs.ecopts; + ARGF.encs = fptr->encs; return argf; } |