X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Fdtime.c;h=6acfaeb63477c51fb4d383003b6ccb1d33fd38e2;hb=ab3e934551e83f49a04975b05c11c1b3d5768642;hp=aa346216d274e009b13a86c8493808f02c3c85e3;hpb=3ef341abe440ece07f8deed59fb026ab020e805a;p=mmh

diff --git a/sbr/dtime.c b/sbr/dtime.c
index aa34621..6acfaeb 100644
--- a/sbr/dtime.c
+++ b/sbr/dtime.c
@@ -12,6 +12,10 @@
 #include <h/tws.h>
 #include <time.h>
 
+#if !defined(HAVE_STRUCT_TM_TM_GMTOFF)
+extern long timezone;
+#endif
+
 /*
  * The number of days in the year, accounting for leap years
  */
@@ -99,8 +103,14 @@ dlocaltime (time_t *clock)
     if (tm->tm_isdst)
 	tw.tw_flags |= TW_DST;
 
+#ifdef HAVE_STRUCT_TM_TM_GMTOFF
+    tw.tw_zone = tm->tm_gmtoff / 60;
+    if (tm->tm_isdst)			/* if DST is in effect */
+	tw.tw_zone -= 60;		/* reset to normal offset */
+#else
     tzset();
     tw.tw_zone = -(timezone / 60);
+#endif
 
     tw.tw_flags &= ~TW_SDAY;
     tw.tw_flags |= TW_SEXP;
@@ -270,7 +280,10 @@ dasctime (struct tws *tw, int flags)
 
 
 /*
- * Get the timezone for given offset
+ * Get the timezone for given offset.
+ * This used to return a three-letter abbreviation for some offset
+ * values.  But not many.  Until there's a good way to do that,
+ * return the string representation of the numeric offset.
  */
 
 char *
@@ -287,11 +300,6 @@ dtimezone (int offset, int flags)
 	hours = offset / 60;
     }
 
-    if (!(flags & TW_ZONE) && mins == 0) {
-	tzset();
-	return ((flags & TW_DST) ? tzname[1] : tzname[0]);
-    }
-
 #ifdef ADJUST_NUMERIC_ONLY_TZ_OFFSETS_WRT_DST
     if (flags & TW_DST)
 	hours += 1;