From 34c5cea9b52b7289b45ebc801a886ca8ecb613b2 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 29 Oct 2008 07:41:21 +0000 Subject: * pack.c (pack_pack): set encoding from packing string and UTF-8 for "U". [ruby-core:19590] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20021 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ pack.c | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index 4c3f022ff7..d3b4f93545 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Oct 29 16:41:17 2008 Nobuyoshi Nakada + + * pack.c (pack_pack): set encoding from packing string and UTF-8 for + "U". [ruby-core:19590] + Wed Oct 29 15:50:00 2008 TAKANO Mitsuhiro (takano32) * complex.c (imp1, imp2): should declare type. diff --git a/pack.c b/pack.c index 9641f6e407..df25231610 100644 --- a/pack.c +++ b/pack.c @@ -10,6 +10,7 @@ **********************************************************************/ #include "ruby/ruby.h" +#include "ruby/encoding.h" #include #include #include @@ -443,6 +444,7 @@ pack_pack(VALUE ary, VALUE fmt) char type; long items, len, idx, plen; const char *ptr; + rb_encoding *enc; #ifdef NATINT_PACK int natint; /* native integer */ #endif @@ -517,6 +519,8 @@ pack_pack(VALUE ary, VALUE fmt) ptr = RSTRING_PTR(from); plen = RSTRING_LEN(from); OBJ_INFECT(res, from); + enc = rb_enc_compatible(res, from); + rb_enc_associate(res, enc); } if (p[-1] == '*') @@ -865,6 +869,8 @@ pack_pack(VALUE ary, VALUE fmt) break; case 'U': /* Unicode character */ + enc = rb_enc_compatible(res, rb_enc_from_encoding(rb_utf8_encoding())); + rb_enc_associate(res, enc); while (len-- > 0) { SIGNED_VALUE l; char buf[8]; -- cgit v1.2.3