Fixed w3c to unix timestamp conversion for FreeBSD

Thanks to Göran Löwkrantz for pointing both to the problem and possible
solution.

Signed-off-by: Michael Krelin <hacker@klever.net>

1 files changed, 18 insertions, 3 deletions

diff --git a/lib/util.cc b/lib/util.cc
index d979502..a46ba2a 100644
--- a/lib/util.cc
+++ b/lib/util.cc
@@ -119,12 +119,27 @@ namespace opkele {
 	    char rv[25];
 	    if(!strftime(rv,sizeof(rv)-1,"%Y-%m-%dT%H:%M:%SZ",&tm_t))
 		throw failed_conversion(OPKELE_CP_ "failed to strftime()");
 	    return rv;
 	}
 
+#ifndef HAVE_TIMEGM
+	static time_t timegm(struct tm *t) {
+	    char *tz = getenv("TZ");
+	    setenv("TZ","",1); tzset();
+	    time_t rv = mktime(t);
+	    if(tz)
+		setenv("TZ",tz,1);
+	    else
+		unsetenv("TZ");
+	    tzset();
+	    return rv;
+	}
+#	define timegm opkele::util::timegm
+#endif /* HAVE_TIMEGM */
+
 	time_t w3c_to_time(const string& w) {
 	    int fraction;
 	    struct tm tm_t;
 	    memset(&tm_t,0,sizeof(tm_t));
 	    if( (
 			sscanf(
@@ -142,16 +157,16 @@ namespace opkele {
 			&fraction
 			) != 7
 		    ) )
 		throw failed_conversion(OPKELE_CP_ "failed to sscanf()");
 	    tm_t.tm_mon--;
 	    tm_t.tm_year-=1900;
-	    time_t rv = mktime(&tm_t);
+	    time_t rv = timegm(&tm_t);
 	    if(rv==(time_t)-1)
-		throw failed_conversion(OPKELE_CP_ "failed to mktime()");
-	    return rv-timezone;
+		throw failed_conversion(OPKELE_CP_ "failed to gmtime()");
+	    return rv;
 	}
 
 	/*
 	 *
 	 */