From 9430d7d8031fd7405420614ce1364fae80cc549f Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 23 Jan 2008 06:25:06 +0000 Subject: [PATCH] * time.c (time_strftime): copy encoding from format. [ruby-dev:33303] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15181 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ time.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index a3c2fae6c8..382c39dae2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Jan 23 15:25:04 2008 Nobuyoshi Nakada + + * time.c (time_strftime): copy encoding from format. [ruby-dev:33303] + Wed Jan 23 15:04:11 2008 Nobuyoshi Nakada * string.c (str_make_independent): should set length. diff --git a/time.c b/time.c index 29e50bc1eb..59d36088a3 100644 --- a/time.c +++ b/time.c @@ -2065,6 +2065,7 @@ rb_strftime(char **buf, const char *format, struct tm *time) static VALUE time_strftime(VALUE time, VALUE format) { + void rb_enc_copy(VALUE, VALUE); struct time_object *tobj; char buffer[SMALLBUF], *buf = buffer; const char *fmt; @@ -2105,6 +2106,7 @@ time_strftime(VALUE time, VALUE format) } str = rb_str_new(buf, len); if (buf != buffer) free(buf); + rb_enc_copy(str, format); return str; }