diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-27 13:45:12 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-27 13:45:12 +0000 |
commit | b5bc09d2347746eda0adf856ece5a3399d7d8839 (patch) | |
tree | 86b4578031365a108216b8301b331e02749ca3ac | |
parent | 9909c67583b2a538e23097759eb6be22a98ff044 (diff) |
* io.c (validate_enc_binmode): do not clear textmode flag if
default. fixed #4732
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31748 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | io.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,4 +1,7 @@ -Fri May 27 22:38:54 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> +Fri May 27 22:45:10 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * io.c (validate_enc_binmode): do not clear textmode flag if + default. fixed #4732 * io.c (fill_cbuf): finish reading at EOF. @@ -4419,10 +4419,12 @@ validate_enc_binmode(int *fmode_p, int ecflags, rb_encoding *enc, rb_encoding *e fmode |= DEFAULT_TEXTMODE; *fmode_p = fmode; } +#if !DEFAULT_TEXTMODE else if (!(ecflags & ECONV_NEWLINE_DECORATOR_MASK)) { fmode &= ~FMODE_TEXTMODE; *fmode_p = fmode; } +#endif } static void |