X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/9827ca52b9f69d29f3bc3c74a8ca95e14ee226ff..9322ba2854211794c27fae9468768b80b767c211:/sbr/dtime.c

diff --git a/sbr/dtime.c b/sbr/dtime.c
index 5d5375d4..89f5dde8 100644
--- a/sbr/dtime.c
+++ b/sbr/dtime.c
@@ -13,13 +13,7 @@
 #include <time.h>
 
 #if !defined(HAVE_STRUCT_TM_TM_GMTOFF)
-extern int daylight;
 extern long timezone;
-extern char *tzname[];
-#endif
-
-#ifndef	abs
-# define abs(a) (a >= 0 ? a : -a)
 #endif
 
 /*
@@ -53,46 +47,6 @@ struct zone {
     int shift;
 };
 
-static struct zone zones[] = {
-    { "GMT", "BST", 0 },
-    { "EST", "EDT", -5 },
-    { "CST", "CDT", -6 },
-    { "MST", "MDT", -7 },
-    { "PST", "PDT", -8 },
-#if 0
-/* RFC1123 specifies do not use military TZs */
-    { "A", NULL, -1 },
-    { "B", NULL, -2 },
-    { "C", NULL, -3 },
-    { "D", NULL, -4 },
-    { "E", NULL, -5 },
-    { "F", NULL, -6 },
-    { "G", NULL, -7 },
-    { "H", NULL, -8 },
-    { "I", NULL, -9 },
-    { "K", NULL, -10 },
-    { "L", NULL, -11 },
-    { "M", NULL, -12 },
-    { "N", NULL, 1 },
-#ifndef	HUJI
-    { "O", NULL, 2 },
-#else
-    { "JST", "JDT", 2 },
-#endif
-    { "P", NULL, 3 },
-    { "Q", NULL, 4 },
-    { "R", NULL, 5 },
-    { "S", NULL, 6 },
-    { "T", NULL, 7 },
-    { "U", NULL, 8 },
-    { "V", NULL, 9 },
-    { "W", NULL, 10 },
-    { "X", NULL, 11 },
-    { "Y", NULL, 12 },
-#endif
-    { NULL, NULL, 0 }
-};
-
 static int dmsize[] = {
     31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
 };
@@ -154,7 +108,14 @@ dlocaltime (time_t *clock)
     if (tm->tm_isdst)			/* if DST is in effect */
 	tw.tw_zone -= 60;		/* reset to normal offset */
 #else
-    tzset();
+    {
+        static bool deja_vu;
+
+        if (!deja_vu) {
+            deja_vu = true;
+            tzset();
+        }
+    }
     tw.tw_zone = -(timezone / 60);
 #endif
 
@@ -278,9 +239,9 @@ dtime (time_t *clock, int alpha_timezone)
     if (alpha_timezone)
 	/* use alpha-numeric timezones */
 	return dasctime (dlocaltime (clock), TW_NULL);
-    else
-	/* use numeric timezones */
-	return dasctime (dlocaltime (clock), TW_ZONE);
+
+    /* use numeric timezones */
+    return dasctime (dlocaltime (clock), TW_ZONE);
 }
 
 
@@ -326,14 +287,16 @@ 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 *
 dtimezone (int offset, int flags)
 {
     int hours, mins;
-    struct zone *z;
     static char buffer[10];
 
     if (offset < 0) {
@@ -344,11 +307,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;
@@ -451,20 +409,6 @@ void
 twscopy (struct tws *tb, struct tws *tw)
 {
     *tb = *tw;  /* struct copy */
-
-#if 0
-    tb->tw_sec   = tw->tw_sec;
-    tb->tw_min   = tw->tw_min;
-    tb->tw_hour  = tw->tw_hour;
-    tb->tw_mday  = tw->tw_mday;
-    tb->tw_mon   = tw->tw_mon;
-    tb->tw_year  = tw->tw_year;
-    tb->tw_wday  = tw->tw_wday;
-    tb->tw_yday  = tw->tw_yday;
-    tb->tw_zone  = tw->tw_zone;
-    tb->tw_clock = tw->tw_clock;
-    tb->tw_flags = tw->tw_flags;
-#endif
 }