Changeset 1785 for trunk/gsdl/lib

Timestamp:

2000-12-12T13:55:22+13:00 (23 years ago)

Author:

sjboddie

Message:

Fixed some trouble with the get_date() function that showed up on windows

File:

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

trunk/gsdl/lib/gsdltimes.cpp

@@ -117 +117 @@
 }
 
-// returns current date and time formatted like "Thu Dec 7 23:43:38 GMT 2000"
+// returns current date and time formatted like "Thu Dec 07 23:43:38 GMT 2000"
 // if ltime is true return value will be expressed in local time, otherwise
-// it'll be Coordinated Universal Time (UTC)
+// it'll be Coordinated Universal Time (UTC) - no promises are made that the
+// resulting string will be formatted exactly as expected, especially on windows
 // returns "" if an error occurs
 text_t get_date (bool ltime) {
 
-  char *timestr = new char[128];
   tm *tm_ptr = NULL;
   time_t t = time(NULL);
@@ -129 +129 @@
   else tm_ptr = gmtime (&t);
   if (tm_ptr == NULL) return "";
+  char *timestr = new char[128];
+  text_t ret;
 
-  strftime (timestr, 128, "%a %b %e %T %Z %Y", tm_ptr);
-  text_t ret = timestr;
+  // we do this in such an ugly way because windows is kind of flakey when
+  // it comes to timezones
+  if (ltime) {
+    strftime (timestr, 128, "%a %b %d %H:%M:%S %z %Y", tm_ptr);
+    ret.setcstr (timestr);
+  } else {
+    strftime (timestr, 128, "%a %b %d %H:%M:%S", tm_ptr);
+    ret.setcstr (timestr);
+    ret += " GMT ";
+    strftime (timestr, 128, "%Y", tm_ptr);
+    ret += timestr;
+  }
+
   delete timestr;
   return ret;