summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--lib/util.cc20
1 files changed, 15 insertions, 5 deletions
diff --git a/lib/util.cc b/lib/util.cc
index e5ca62d..ee75d29 100644
--- a/lib/util.cc
+++ b/lib/util.cc
@@ -114,22 +114,32 @@ namespace opkele {
114 } 114 }
115 115
116 time_t w3c_to_time(const string& w) { 116 time_t w3c_to_time(const string& w) {
117 int fraction;
117 struct tm tm_t; 118 struct tm tm_t;
118 memset(&tm_t,0,sizeof(tm_t)); 119 memset(&tm_t,0,sizeof(tm_t));
119 if( 120 if( (
121 sscanf(
122 w.c_str(),
123 "%04d-%02d-%02dT%02d:%02d:%02dZ",
124 &tm_t.tm_year,&tm_t.tm_mon,&tm_t.tm_mday,
125 &tm_t.tm_hour,&tm_t.tm_min,&tm_t.tm_sec
126 ) != 6
127 ) && (
120 sscanf( 128 sscanf(
121 w.c_str(), 129 w.c_str(),
122 "%04d-%02d-%02dT%02d:%02d:%02dZ", 130 "%04d-%02d-%02dT%02d:%02d:%02d.%03dZ",
123 &tm_t.tm_year,&tm_t.tm_mon,&tm_t.tm_mday, 131 &tm_t.tm_year,&tm_t.tm_mon,&tm_t.tm_mday,
124 &tm_t.tm_hour,&tm_t.tm_min,&tm_t.tm_sec 132 &tm_t.tm_hour,&tm_t.tm_min,&tm_t.tm_sec,
125 ) != 6 ) 133 &fraction
134 ) != 7
135 ) )
126 throw failed_conversion(OPKELE_CP_ "failed to sscanf()"); 136 throw failed_conversion(OPKELE_CP_ "failed to sscanf()");
127 tm_t.tm_mon--; 137 tm_t.tm_mon--;
128 tm_t.tm_year-=1900; 138 tm_t.tm_year-=1900;
129 time_t rv = mktime(&tm_t); 139 time_t rv = mktime(&tm_t);
130 if(rv==(time_t)-1) 140 if(rv==(time_t)-1)
131 throw failed_conversion(OPKELE_CP_ "failed to mktime()"); 141 throw failed_conversion(OPKELE_CP_ "failed to mktime()");
132 return rv; 142 return rv-timezone;
133 } 143 }
134 144
135 /* 145 /*