diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | time.c | 17 |
2 files changed, 21 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Thu Jul 27 16:49:01 2006 Yukihiro Matsumoto <matz@ruby-lang.org> + + * 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 <matz@ruby-lang.org> * ext/openssl/ossl.h: move <ruby.h> inclusion point to shut up @@ -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); } |