Bug 191703: if struct tm has the nonstandard tm_zone and tm_gmtoff fields,

set them to the appropriate values.  Calling mktime is not really correct
(it assumes the local time zone) and does not work on NetBSD.
Tag: NSPRPUB_PRE_4_2_CLIENT_BRANCH

1 files changed, 5 insertions, 7 deletions

diff --git a/pr/src/misc/prtime.c b/pr/src/misc/prtime.c
index a107d1d4..aeb7992c 100644
--- a/pr/src/misc/prtime.c
+++ b/pr/src/misc/prtime.c
@@ -1662,15 +1662,13 @@ PR_FormatTime(char *buf, int buflen, const char *fmt, const PRExplodedTime *tm)
 
 /*
  * On some platforms, for example SunOS 4, struct tm has two additional
- * fields: tm_zone and tm_gmtoff.  The following code attempts to obtain
- * values for these two fields.
+ * fields: tm_zone and tm_gmtoff.
  */
 
-#if defined(SUNOS4) || (__GLIBC__ >= 2) || defined(XP_BEOS)
-    if (mktime(&a) == -1) {
-        PR_snprintf(buf, buflen, "can't get timezone");
-        return 0;
-    }
+#if defined(SUNOS4) || (__GLIBC__ >= 2) || defined(XP_BEOS) \
+        || defined(NETBSD)
+    a.tm_zone = NULL;
+    a.tm_gmtoff = tm->tm_params.tp_gmt_offset + tm->tm_params.tp_dst_offset;
 #endif
 
     return strftime(buf, buflen, fmt, &a);