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

* transcode.c (econv_primitive_convert): accept nil as input for empty

Browse source 
input.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18910 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2008-08-28 17:13:49 +00:00
parent 63846d48a9
commit 3811bb53bd
3 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Aug 29 02:11:46 2008 Tanaka Akira <akr@fsij.org>
* transcode.c (econv_primitive_convert): accept nil as input for empty
input.
Fri Aug 29 02:03:56 2008 Shugo Maeda <shugo@ruby-lang.org> Fri Aug 29 02:03:56 2008 Shugo Maeda <shugo@ruby-lang.org>
* strftime.c (rb_strftime): supported %s and %P. * strftime.c (rb_strftime): supported %s and %P.

6
test/ruby/test_econv.rb
View file

@ -79,6 +79,12 @@ class TestEncodingConverter < Test::Unit::TestCase
} }
end end
def test_nil_input
ec = Encoding::Converter.new("UTF-8", "EUC-JP")
ret = ec.primitive_convert(nil, dst="", nil, 10)
assert_equal(:finished, ret)
end
def test_partial_input def test_partial_input
ec = Encoding::Converter.new("UTF-8", "EUC-JP") ec = Encoding::Converter.new("UTF-8", "EUC-JP")
ret = ec.primitive_convert(src="", dst="", nil, 10, Encoding::Converter::PARTIAL_INPUT) ret = ec.primitive_convert(src="", dst="", nil, 10, Encoding::Converter::PARTIAL_INPUT)

22
transcode.c
View file

@ -2339,8 +2339,13 @@ econv_result_to_symbol(rb_econv_result_t res)
* *
* primitive_convert converts source_buffer into destination_buffer. * primitive_convert converts source_buffer into destination_buffer.
* *
* source_buffer and destination_buffer should be a string. * source_buffer should be a string or nil.
* nil means a empty string.
*
* adestination_buffer should be a string.
*
* destination_byteoffset should be an integer or nil. * destination_byteoffset should be an integer or nil.
*
* destination_bytesize and flags should be an integer. * destination_bytesize and flags should be an integer.
* *
* primitive_convert convert the content of source_buffer from beginning * primitive_convert convert the content of source_buffer from beginning
@ -2415,7 +2420,8 @@ econv_primitive_convert(int argc, VALUE *argv, VALUE self)
flags = NUM2INT(flags_v); flags = NUM2INT(flags_v);
StringValue(output); StringValue(output);
StringValue(input); if (!NIL_P(input))
StringValue(input);
rb_str_modify(output); rb_str_modify(output);
if (output_byteoffset_v == Qnil) if (output_byteoffset_v == Qnil)
@ -2440,15 +2446,21 @@ econv_primitive_convert(int argc, VALUE *argv, VALUE self)
if (rb_str_capacity(output) < output_byteend) if (rb_str_capacity(output) < output_byteend)
rb_str_resize(output, output_byteend); rb_str_resize(output, output_byteend);
ip = (const unsigned char *)RSTRING_PTR(input); if (NIL_P(input)) {
is = ip + RSTRING_LEN(input); ip = is = NULL;
}
else {
ip = (const unsigned char *)RSTRING_PTR(input);
is = ip + RSTRING_LEN(input);
}
op = (unsigned char *)RSTRING_PTR(output) + output_byteoffset; op = (unsigned char *)RSTRING_PTR(output) + output_byteoffset;
os = op + output_bytesize; os = op + output_bytesize;
res = rb_econv_convert(ec, &ip, is, &op, os, flags); res = rb_econv_convert(ec, &ip, is, &op, os, flags);
rb_str_set_len(output, op-(unsigned char *)RSTRING_PTR(output)); rb_str_set_len(output, op-(unsigned char *)RSTRING_PTR(output));
rb_str_drop_bytes(input, ip - (unsigned char *)RSTRING_PTR(input)); if (!NIL_P(input))
rb_str_drop_bytes(input, ip - (unsigned char *)RSTRING_PTR(input));
if (ec->destination_encoding) { if (ec->destination_encoding) {
rb_enc_associate(output, ec->destination_encoding); rb_enc_associate(output, ec->destination_encoding);