summaryrefslogtreecommitdiff
path: root/time.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-09-04 17:32:30 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-09-04 17:32:30 +0000
commit60f40519f00ab9841a40afcaefbc6efc36a760cd (patch)
treea41b6c68e5c153819d7a7cb35e5073c3975b97ca /time.c
parentbdb2f9646d54be023431ab4e958cdb96a5a11ebe (diff)
* time.c (time_to_s): make it conform to RFC2822 date format.
[ruby-dev:29467] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10860 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'time.c')
-rw-r--r--time.c29
1 files changed, 12 insertions, 17 deletions
diff --git a/time.c b/time.c
index 11443e3..50d537b 100644
--- a/time.c
+++ b/time.c
@@ -1253,32 +1253,27 @@ time_to_s(time)
struct time_object *tobj;
char buf[128];
int len;
+ time_t off;
+ char buf2[32];
+ char sign = '+';
GetTimeval(time, tobj);
if (tobj->tm_got == 0) {
time_get_tm(time, tobj->gmt);
}
- if (tobj->gmt == 1) {
- len = strftime(buf, 128, "%a %b %d %H:%M:%S UTC %Y", &tobj->tm);
- }
- else {
- time_t off;
- char buf2[32];
- char sign = '+';
#if defined(HAVE_STRUCT_TM_TM_GMTOFF)
- off = tobj->tm.tm_gmtoff;
+ off = tobj->tm.tm_gmtoff;
#else
- VALUE tmp = time_utc_offset(time);
- off = NUM2INT(tmp);
+ 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, (int)(off/3600), (int)(off%3600/60));
- len = strftime(buf, 128, buf2, &tobj->tm);
+ if (off < 0) {
+ sign = '-';
+ off = -off;
}
+ sprintf(buf2, "%%a, %%b %%d %%Y %%H:%%M:%%S %c%02d%02d",
+ sign, (int)(off/3600), (int)(off%3600/60));
+ len = strftime(buf, 128, buf2, &tobj->tm);
return rb_str_new(buf, len);
}