Clean up time handling; always assume we have tzset().

Also assume that the right prototype is in time.h (both are valid in POSIX).

Pulled in from nmh. Thanks to Ken Hornstein.

diff --git a/configure.ac b/configure.ac
index 466a9dd..a1f287c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -335,7 +335,6 @@ esac
 AC_SUBST(OURDEFS)
 
 AC_HEADER_STDC
-AC_HEADER_TIME
 AC_HEADER_TIOCGWINSZ
 AC_CHECK_HEADERS(fcntl.h crypt.h termcap.h \
                  langinfo.h wchar.h wctype.h iconv.h \
@@ -360,7 +359,7 @@ AC_CHECK_HEADER([sys/ptem.h], AC_DEFINE(WINSIZE_IN_PTEM,1,
 dnl ---------------
 dnl CHECK FUNCTIONS
 dnl ---------------
-AC_CHECK_FUNCS(lstat tzset getutent nl_langinfo mbtowc wcwidth)
+AC_CHECK_FUNCS(lstat getutent nl_langinfo mbtowc wcwidth)
 
 dnl Look for the initgroups() declaration.  On AIX 4.[13], Solaris 4.1.3, and
 dnl ULTRIX 4.2A the function is defined in libc but there's no declaration in
@@ -534,17 +533,7 @@ dnl ----------------
 dnl CHECK STRUCTURES
 dnl ----------------
 
-AC_CHECK_MEMBERS(struct tm.tm_gmtoff,,,
-  [#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif])
+AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[#include <time.h>])
 
 AC_CHECK_MEMBERS(struct utmp.ut_type,,,[#include <utmp.h>])
 

diff --git a/sbr/dtime.c b/sbr/dtime.c
index b427dfd..e0405e9 100644 (file)
--- a/sbr/dtime.c
+++ b/sbr/dtime.c
@@ -9,23 +9,9 @@
 #include <h/mh.h>   /* for snprintf() */
 #include <h/nmh.h>
 #include <h/tws.h>
+#include <time.h>
 
-#if !defined(HAVE_STRUCT_TM_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_STRUCT_TM_TM_GMTOFF) && defined(HAVE_TZSET)
+#if !defined(HAVE_STRUCT_TM_TM_GMTOFF)
 extern int daylight;
 extern long timezone;
 extern char *tzname[];
@@ -66,46 +52,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
 };
@@ -139,7 +85,7 @@ dlocaltime(time_t *clock)
        static struct tws tw;
        struct tm *tm;
 
-#if !defined(HAVE_STRUCT_TM_TM_GMTOFF) && !defined(HAVE_TZSET)
+#if !defined(HAVE_STRUCT_TM_TM_GMTOFF)
        struct timeb tb;
 #endif
 
@@ -171,13 +117,8 @@ dlocaltime(time_t *clock)
        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;
@@ -355,7 +296,6 @@ char *
 dtimezone(int offset, int flags)
 {
        int hours, mins;
-       struct zone *z;
        static char buffer[10];
 
        if (offset < 0) {
@@ -367,14 +307,8 @@ dtimezone(int offset, int flags)
        }
 
        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

diff --git a/sbr/dtimep.lex b/sbr/dtimep.lex
index a353393..b5fac4f 100644 (file)
--- a/sbr/dtimep.lex
+++ b/sbr/dtimep.lex
@@ -10,6 +10,7 @@
 %{
 #include <h/nmh.h>
 #include <h/tws.h>
+#include <time.h>
 
   /* Since we're looking at a string at a time, don't worry about
    *  wrapping to the next buffer.