From d0a297acb760c28aba45208f89c802668677c592 Mon Sep 17 00:00:00 2001 From: matz Date: Thu, 27 Jul 2006 07:53:18 +0000 Subject: * time.c (time_to_s): use +0900 style timezone string for local time. [ruby-dev:29143] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@10622 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ time.c | 17 ++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b450a193a..663594479 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Jul 27 16:49:01 2006 Yukihiro Matsumoto + + * time.c (time_to_s): use +0900 style timezone string for local time. + [ruby-dev:29143] + Thu Jul 27 16:41:15 2006 Yukihiro Matsumoto * ext/openssl/ossl.h: move inclusion point to shut up diff --git a/time.c b/time.c index d0c2de4a8..72dae4516 100644 --- a/time.c +++ b/time.c @@ -1261,7 +1261,22 @@ time_to_s(time) len = strftime(buf, 128, "%a %b %d %H:%M:%S UTC %Y", &tobj->tm); } else { - len = strftime(buf, 128, "%a %b %d %H:%M:%S %Z %Y", &tobj->tm); + time_t off; + char buf2[32]; + char sign = '+'; +#if defined(HAVE_STRUCT_TM_TM_GMTOFF) + off = tobj->tm.tm_gmtoff; +#else + VALUE tmp = time_utc_offset(time); + off = NUM2INT(tmp); +#endif + if (off < 0) { + sign = '-'; + off = -off; + } + sprintf(buf2, "%%a %%b %%d %%H:%%M:%%S %c%02d%02d %%Y", + sign, off/3600, off%3600/60); + len = strftime(buf, 128, buf2, &tobj->tm); } return rb_str_new(buf, len); } -- cgit