diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-06 05:37:20 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-06 05:37:20 +0000 |
commit | 343deb4c39747be1a373d9ab9193d9798045f8ee (patch) | |
tree | 69da53a521c671861657552c4bbe0a0cf8d6bf57 | |
parent | 83b37cfc4f03168b97fc6f224624fe1ec2414d9e (diff) | |
download | ruby-343deb4c39747be1a373d9ab9193d9798045f8ee.tar.gz |
* pack.c (pack_pack): set US-ASCII and CODERANGE_7BIT
when quoted-printable ('M') and base64 ('m').
[ruby-dev:37284]
* pack.c (pack_unpack): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20563 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | pack.c | 4 |
2 files changed, 12 insertions, 0 deletions
@@ -1,3 +1,11 @@ +Sat Dec 6 14:35:06 2008 NARUSE, Yui <naruse@ruby-lang.org> + + * pack.c (pack_pack): set US-ASCII and CODERANGE_7BIT + when quoted-printable ('M') and base64 ('m'). + [ruby-dev:37284] + + * pack.c (pack_unpack): ditto. + Fri Dec 5 21:45:45 2008 Tadayoshi Funaba <tadf@dotrb.org> * rational.c (nurat_{to_s,inspect}): performance improvement. @@ -921,6 +921,7 @@ pack_pack(VALUE ary, VALUE fmt) plen -= todo; ptr += todo; } + ENCODING_CODERANGE_SET(res, rb_usascii_encindex(), ENC_CODERANGE_7BIT); break; case 'M': /* quoted-printable encoded string */ @@ -928,6 +929,7 @@ pack_pack(VALUE ary, VALUE fmt) if (len <= 1) len = 72; qpencode(res, from, len); + ENCODING_CODERANGE_SET(res, rb_usascii_encindex(), ENC_CODERANGE_7BIT); break; case 'P': /* pointer to packed byte string */ @@ -1886,6 +1888,7 @@ pack_unpack(VALUE str, VALUE fmt) } } rb_str_set_len(buf, ptr - RSTRING_PTR(buf)); + ENCODING_CODERANGE_SET(buf, rb_usascii_encindex(), ENC_CODERANGE_7BIT); UNPACK_PUSH(buf); } break; @@ -1914,6 +1917,7 @@ pack_unpack(VALUE str, VALUE fmt) s++; } rb_str_set_len(buf, ptr - RSTRING_PTR(buf)); + ENCODING_CODERANGE_SET(buf, rb_usascii_encindex(), ENC_CODERANGE_7BIT); UNPACK_PUSH(buf); } break; |