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
@@ -101,75 +101,90 @@ namespace opkele {
 	string bignum_to_base64(const BIGNUM *bn) {
 	    vector<unsigned char> bin(BN_num_bytes(bn)+1);
 	    unsigned char *binptr = &(bin.front())+1;
 	    int l = BN_bn2bin(bn,binptr);
 	    if(l && (*binptr)&0x80){
 		(*(--binptr)) = 0; ++l;
 	    }
 	    return encode_base64(binptr,l);
 	}
 
 	/*
 	 * w3c times
 	 */
 
 	string time_to_w3c(time_t t) {
 	    struct tm tm_t;
 	    if(!gmtime_r(&t,&tm_t))
 		throw failed_conversion(OPKELE_CP_ "failed to BN_dec2bn()");
 	    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(
 			    w.c_str(),
 			    "%04d-%02d-%02dT%02d:%02d:%02dZ",
 			    &tm_t.tm_year,&tm_t.tm_mon,&tm_t.tm_mday,
 			    &tm_t.tm_hour,&tm_t.tm_min,&tm_t.tm_sec
 			    ) != 6
 		) && (
 		    sscanf(
 			w.c_str(),
 			"%04d-%02d-%02dT%02d:%02d:%02d.%03dZ",
 			&tm_t.tm_year,&tm_t.tm_mon,&tm_t.tm_mday,
 			&tm_t.tm_hour,&tm_t.tm_min,&tm_t.tm_sec,
 			&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;
 	}
 
 	/*
 	 *
 	 */
 
 	static inline bool isrfc3986unreserved(int c) {
 	    if(c<'-') return false;
 	    if(c<='.') return true;
 	    if(c<'0') return false; if(c<='9') return true;
 	    if(c<'A') return false; if(c<='Z') return true;
 	    if(c<'_') return false;
 	    if(c=='_') return true;
 	    if(c<'a') return false; if(c<='z') return true;
 	    if(c=='~') return true;
 	    return false;
 	}
 
 	struct __url_encoder : public unary_function<char,void> {
 	    public:
 		string& rv;
 
 		__url_encoder(string& r) : rv(r) { }