summaryrefslogtreecommitdiffstats
path: root/io.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-21 10:07:21 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-21 10:07:21 +0000
commit70a17d1da3e038eb2a36f6d26fd8c9b24e954ce9 (patch)
treeaa1b3be1ec32f745dfc96351f36ec58547518503 /io.c
parenta11a4dea2e34df21534fe6d2ed2db78c37c4a7a0 (diff)
downloadruby-70a17d1da3e038eb2a36f6d26fd8c9b24e954ce9.tar.gz
ruby-70a17d1da3e038eb2a36f6d26fd8c9b24e954ce9.tar.xz
ruby-70a17d1da3e038eb2a36f6d26fd8c9b24e954ce9.zip
* io.c (io_extract_encoding_option): if internal encoding is not
specified, enc is external encoding. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18751 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r--io.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/io.c b/io.c
index 58339d3fd..1349bfcd7 100644
--- a/io.c
+++ b/io.c
@@ -3782,9 +3782,12 @@ io_extract_encoding_option(VALUE opt, rb_encoding **enc_p, rb_encoding **enc2_p)
}
else {
*enc_p = intencoding;
+ *enc2_p = extencoding;
}
}
- *enc2_p = extencoding;
+ else {
+ *enc_p = extencoding;
+ }
}
else {
if (!NIL_P(intenc)) {