summaryrefslogtreecommitdiffstats
path: root/io.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-18 16:33:46 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-18 16:33:46 +0000
commit4aa0fea5d6d76ec0e84beafd1f14717c626a8a4e (patch)
treec31859931992245ab5b0e75de06d8110a866b373 /io.c
parentd12741ce98bf96ac53f2c593eea08869c9b2f1ac (diff)
downloadruby-4aa0fea5d6d76ec0e84beafd1f14717c626a8a4e.tar.gz
ruby-4aa0fea5d6d76ec0e84beafd1f14717c626a8a4e.tar.xz
ruby-4aa0fea5d6d76ec0e84beafd1f14717c626a8a4e.zip
* io.c (rb_open_file): encoding in mode string was ignored if perm is
specified. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18700 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r--io.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/io.c b/io.c
index ad0cb3f7a..30e407f5d 100644
--- a/io.c
+++ b/io.c
@@ -4506,6 +4506,12 @@ rb_open_file(int argc, VALUE *argv, VALUE io)
fmode = NIL_P(perm) ? 0666 : NUM2UINT(perm);
rb_file_sysopen_internal(io, RSTRING_PTR(fname), flags, fmode);
+
+ if (!FIXNUM_P(vmode)) {
+ rb_io_t *fptr;
+ GetOpenFile(io, fptr);
+ rb_io_mode_enc(fptr, StringValueCStr(vmode));
+ }
}
else {
mode = NIL_P(vmode) ? "r" : StringValueCStr(vmode);