X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fdtime.c;h=48e13dbbdccdfd3174c4ccf6d5846f80e21ec8bd;hp=737f998876fb1d3adc36e1cb05ac5cba46fede46;hb=6195a89359453dc49064c8f7a28c02165d2cb972;hpb=714b5c530ece27ea2835a313013f5b770163403c

diff --git a/sbr/dtime.c b/sbr/dtime.c
index 737f998..48e13db 100644
--- a/sbr/dtime.c
+++ b/sbr/dtime.c
@@ -9,26 +9,10 @@
 #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)
-extern int daylight;
+#if !defined(HAVE_STRUCT_TM_TM_GMTOFF)
 extern long timezone;
-extern char *tzname[];
 #endif
 
 #ifndef abs
@@ -66,46 +50,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,10 +83,6 @@ dlocaltime(time_t *clock)
 	static struct tws tw;
 	struct tm *tm;
 
-#if !defined(HAVE_STRUCT_TM_TM_GMTOFF) && !defined(HAVE_TZSET)
-	struct timeb tb;
-#endif
-
 	if (!clock)
 		return NULL;
 
@@ -171,13 +111,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 +290,6 @@ char *
 dtimezone(int offset, int flags)
 {
 	int hours, mins;
-	struct zone *z;
 	static char buffer[10];
 
 	if (offset < 0) {
@@ -367,14 +301,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
@@ -478,20 +406,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
 }