Removed some dead code, all inside #if 0's. I tried to not remove

[mmh] / sbr / dtime.c

diff --git a/sbr/dtime.c b/sbr/dtime.c
index 3a37fe3..acab877 100644 (file)
--- a/sbr/dtime.c
+++ b/sbr/dtime.c
@@ -2,36 +2,18 @@
 /*
  * dtime.c -- time/date routines
  *
- * $Id$
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
  */
 
 #include <h/mh.h>   /* for snprintf() */
 #include <h/nmh.h>
 #include <h/tws.h>
+#include <time.h>
 
-#if !defined(HAVE_TM_GMTOFF) && !defined(HAVE_TZSET)
-# include <sys/timeb.h>
-#endif
-
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
-#if !defined(HAVE_TM_GMTOFF) && defined(HAVE_TZSET)
-extern int daylight;
+#if !defined(HAVE_STRUCT_TM_TM_GMTOFF)
 extern long timezone;
-extern char *tzname[];
-#endif
-
-#ifndef        abs
-# define abs(a) (a >= 0 ? a : -a)
 #endif
 
 /*
@@ -65,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
 };
@@ -138,10 +80,6 @@ dlocaltime (time_t *clock)
     static struct tws tw;
     struct tm *tm;
 
-#if !defined(HAVE_TM_GMTOFF) && !defined(HAVE_TZSET)
-    struct timeb tb;
-#endif
-
     if (!clock)
        return NULL;
 
@@ -165,18 +103,13 @@ dlocaltime (time_t *clock)
     if (tm->tm_isdst)
        tw.tw_flags |= TW_DST;
 
-#ifdef HAVE_TM_GMTOFF
+#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
-# ifdef HAVE_TZSET
     tzset();
     tw.tw_zone = -(timezone / 60);
-# else
-    ftime (&tb);
-    tw.tw_zone = -tb.timezone;
-# endif
 #endif
 
     tw.tw_flags &= ~TW_SDAY;
@@ -347,14 +280,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) {
@@ -365,17 +300,6 @@ dtimezone (int offset, int flags)
        hours = offset / 60;
     }
 
-    if (!(flags & TW_ZONE) && mins == 0) {
-#if defined(HAVE_TZSET) && defined(HAVE_TZNAME)
-       tzset();
-       return ((flags & TW_DST) ? tzname[1] : tzname[0]);
-#else
-       for (z = zones; z->std; z++)
-           if (z->shift == hours)
-               return (z->dst && (flags & TW_DST) ? z->dst : z->std);
-#endif
-    }
-
 #ifdef ADJUST_NUMERIC_ONLY_TZ_OFFSETS_WRT_DST
     if (flags & TW_DST)
        hours += 1;
@@ -478,20 +402,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
 }