From bbe004c1e461a5769663ddc0b24d0b517fe3c118 Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 16 Nov 2011 02:36:08 +0000 Subject: * io.c (argf_next_argv): wrong timing of setting ecflags. fixed the failure of TestArgf#test_textmode introduced at r33662. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33770 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ io.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d5b1686840..d99df78d45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Nov 16 11:34:20 2011 NAKAMURA Usaku + + * io.c (argf_next_argv): wrong timing of setting ecflags. + fixed the failure of TestArgf#test_textmode introduced at r33662. + Wed Nov 16 10:45:00 2011 NAKAMURA Usaku * ext/-test-/num2int/num2int.c: remove an unnecessary and wrong decl diff --git a/io.c b/io.c index 7ae0a86335..0a4c21b225 100644 --- a/io.c +++ b/io.c @@ -7137,9 +7137,6 @@ argf_next_argv(VALUE argf) fmode = FMODE_READABLE; if (!ARGF.binmode) { fmode |= DEFAULT_TEXTMODE; -#ifdef TEXTMODE_NEWLINE_DECORATOR_ON_WRITE - fptr->encs.ecflags |= TEXTMODE_NEWLINE_DECORATOR_ON_WRITE; -#endif } ARGF.current_file = prep_io(fr, fmode, rb_cFile, fn); if (!NIL_P(write_io)) { @@ -7156,6 +7153,9 @@ argf_next_argv(VALUE argf) fptr->encs.ecflags &= ~ECONV_NEWLINE_DECORATOR_MASK; if (!ARGF.binmode) { fptr->encs.ecflags |= ECONV_DEFAULT_NEWLINE_DECORATOR; +#ifdef TEXTMODE_NEWLINE_DECORATOR_ON_WRITE + fptr->encs.ecflags |= TEXTMODE_NEWLINE_DECORATOR_ON_WRITE; +#endif } } ARGF.next_p = 0; -- cgit v1.2.3