Changeset 21c87a7 for lib/misc.c

Timestamp:

2010-04-14T09:27:50Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

d33679e

Parents:

81186cab (diff), 156bbd7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging loads of stuff from mainline.

File:

• lib/misc.c (modified) (1 diff)

lib/misc.c

@@ -77 +77 @@
         
         return mktime(&tm);
+}
+
+time_t mktime_utc( struct tm *tp )
+{
+        struct tm utc;
+        time_t res, tres;
+        
+        tp->tm_isdst = -1;
+        res = mktime( tp );
+        /* Problem is, mktime() just gave us the GMT timestamp for the
+           given local time... While the given time WAS NOT local. So
+           we should fix this now.
+           
+           Now I could choose between messing with environment variables
+           (kludgy) or using timegm() (not portable)... Or doing the
+           following, which I actually prefer...
+           
+           tzset() may also work but in other places I actually want to
+           use local time.
+           
+           FFFFFFFFFFFFFFFFFFFFFUUUUUUUUUUUUUUUUUUUU!! */
+        gmtime_r( &res, &utc );
+        utc.tm_isdst = -1;
+        if( utc.tm_hour == tp->tm_hour && utc.tm_min == tp->tm_min )
+                /* Sweet! We're in UTC right now... */
+                return res;
+        
+        tres = mktime( &utc );
+        res += res - tres;
+        
+        /* Yes, this is a hack. And it will go wrong around DST changes.
+           BUT this is more likely to be threadsafe than messing with
+           environment variables, and possibly more portable... */
+        
+        return res;
 }