Changeset 3424 for trunk/gsdl/lib

Timestamp:

2002-09-13T14:52:20+12:00 (22 years ago)

Author:

jrm21

Message:

Need some slightly extra stuff for converting times when under darwin.
(Otherwise keys expire immediately under collector on darwin).

File:

• trunk/gsdl/lib/gsdltimes.cpp (modified) (2 diffs)

trunk/gsdl/lib/gsdltimes.cpp

@@ -29 +29 @@
 // Coordinated Universal Time (UTC))
 // returns "" if an error occurs
+// !! Actually, we now return a string in localtime, as text2time returns
+//    a time in localtime (mktime assumes local timezone). - jrm21 Sep 2002
 text_t time2text (time_t time) {
-  tm *tm_ptr = gmtime(&time);
+  // tm *tm_ptr = gmtime(&time);
+  tm *tm_ptr = localtime(&time);
+
   if (tm_ptr == NULL) return "";
 
@@ -113 +117 @@
   if (timetm.tm_sec < 0 || timetm.tm_sec > 59)
     return (time_t) -1;
-  
+
+  timetm.tm_isdst=0;
+
+  /* This is for darwin - mktime seems to use this, so don't leave it
+     uninitialised!! Maybe the same on freebsd/netbsd?
+     I read somewhere that APOLLO and AUX #define BSD but don't have this,
+     however that was dated 1995...
+  */
+#if defined(BSD)
+  timetm.tm_gmtoff=0;
+#endif
+
+  // mktime assumes timetm is localtime
   return mktime (&timetm);
 }