kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* io.c (validate_enc_binmode): extracted from rb_io_extract_modeenc.

Browse source 
(rb_io_extract_modeenc): use validate_enc_binmode.
  (io_encoding_set): call validate_enc_binmode.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19313 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2008-09-12 17:58:58 +00:00
parent 7e58885f0a
commit 76c02f05a2
3 changed files with 60 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Sat Sep 13 02:58:05 2008 Tanaka Akira <akr@fsij.org>
* io.c (validate_enc_binmode): extracted from rb_io_extract_modeenc.
(rb_io_extract_modeenc): use validate_enc_binmode.
(io_encoding_set): call validate_enc_binmode.
Sat Sep 13 02:50:34 2008 Tanaka Akira <akr@fsij.org> Sat Sep 13 02:50:34 2008 Tanaka Akira <akr@fsij.org>
* transcode.c (rb_econv_prepare_opts): initialize *opt and return 0 * transcode.c (rb_econv_prepare_opts): initialize *opt and return 0

57
io.c
View file

@ -3852,6 +3852,16 @@ io_extract_encoding_option(VALUE opt, rb_encoding **enc_p, rb_encoding **enc2_p)
typedef struct rb_io_enc_t convconfig_t; typedef struct rb_io_enc_t convconfig_t;
static void
validate_enc_binmode(int fmode, rb_encoding *enc, rb_encoding *enc2)
{
if ((fmode & FMODE_READABLE) &&
!enc2 &&
!(fmode & FMODE_BINMODE) &&
!rb_enc_asciicompat(enc ? enc : rb_default_external_encoding()))
rb_raise(rb_eArgError, "ASCII incompatible encoding needs binmode");
}
static void static void
rb_io_extract_modeenc(VALUE *vmode_p, VALUE opthash, rb_io_extract_modeenc(VALUE *vmode_p, VALUE opthash,
int *oflags_p, int *fmode_p, convconfig_t *convconfig_p) int *oflags_p, int *fmode_p, convconfig_t *convconfig_p)
@ -3919,11 +3929,7 @@ rb_io_extract_modeenc(VALUE *vmode_p, VALUE opthash,
if ((fmode & FMODE_BINMODE) && (fmode & FMODE_TEXTMODE)) if ((fmode & FMODE_BINMODE) && (fmode & FMODE_TEXTMODE))
rb_raise(rb_eArgError, "both textmode and binmode specified"); rb_raise(rb_eArgError, "both textmode and binmode specified");
if ((fmode & FMODE_READABLE) && validate_enc_binmode(fmode, enc, enc2);
!enc2 &&
!(fmode & FMODE_BINMODE) &&
!rb_enc_asciicompat(enc ? enc : rb_default_external_encoding()))
rb_raise(rb_eArgError, "ASCII incompatible encoding needs binmode");
*vmode_p = vmode; *vmode_p = vmode;
@ -6623,36 +6629,45 @@ io_new_instance(VALUE args)
static void static void
io_encoding_set(rb_io_t *fptr, int argc, VALUE v1, VALUE v2, VALUE opt) io_encoding_set(rb_io_t *fptr, int argc, VALUE v1, VALUE v2, VALUE opt)
{ {
rb_encoding *enc, *enc2;
int ecflags;
VALUE ecopts;
if (NIL_P(v2)) argc = 1; if (NIL_P(v2)) argc = 1;
if (argc == 2) { if (argc == 2) {
fptr->encs.enc2 = rb_to_encoding(v1); enc2 = rb_to_encoding(v1);
fptr->encs.enc = rb_to_encoding(v2); enc = rb_to_encoding(v2);
fptr->encs.ecflags = rb_econv_prepare_opts(opt, &fptr->encs.ecopts); ecflags = rb_econv_prepare_opts(opt, &ecopts);
clear_codeconv(fptr);
} }
else if (argc == 1) { else if (argc == 1) {
if (NIL_P(v1)) { if (NIL_P(v1)) {
fptr->encs.enc = NULL; enc = NULL;
fptr->encs.enc2 = NULL; enc2 = NULL;
fptr->encs.ecflags = 0; ecflags = 0;
fptr->encs.ecopts = Qnil; ecopts = Qnil;
clear_codeconv(fptr);
} }
else { else {
VALUE tmp = rb_check_string_type(v1); VALUE tmp = rb_check_string_type(v1);
if (!NIL_P(tmp)) { if (!NIL_P(tmp)) {
mode_enc(fptr, StringValueCStr(tmp)); parse_mode_enc(StringValueCStr(tmp), &enc, &enc2);
fptr->encs.ecflags = rb_econv_prepare_opts(opt, &fptr->encs.ecopts); ecflags = rb_econv_prepare_opts(opt, &ecopts);
} }
else { else {
fptr->encs.enc = rb_to_encoding(v1); enc = rb_to_encoding(v1);
fptr->encs.enc2 = NULL; enc2 = NULL;
fptr->encs.ecflags = 0; ecflags = 0;
fptr->encs.ecopts = Qnil; ecopts = Qnil;
clear_codeconv(fptr);
} }
} }
} }
validate_enc_binmode(fptr->mode, enc, enc2);
fptr->encs.enc = enc;
fptr->encs.enc2 = enc2;
fptr->encs.ecflags = ecflags;
fptr->encs.ecopts = ecopts;
clear_codeconv(fptr);
} }
/* /*

18
test/ruby/test_io_m17n.rb
View file

@ -807,6 +807,24 @@ EOT
} }
end end
def test_set_encoding_binmode
assert_raise(ArgumentError) {
open("/dev/null", "rt") {|f|
f.set_encoding("iso-2022-jp")
}
}
assert_raise(ArgumentError) {
open("/dev/null", "r") {|f|
f.set_encoding("iso-2022-jp")
}
}
assert_nothing_raised {
open("/dev/null", "rb") {|f|
f.set_encoding("iso-2022-jp")
}
}
end
def test_write_conversion_fixenc def test_write_conversion_fixenc
with_pipe {|r, w| with_pipe {|r, w|
w.set_encoding("iso-2022-jp:utf-8") w.set_encoding("iso-2022-jp:utf-8")