X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fdtime.c;h=1d3bc060f33907d4a885fd80c1bbfb2baa808a4b;hp=e0405e99fc66df4ad140bdcd2db40135a022f3fe;hb=f78e7c6e6e616cc4ff2bee8a726365fafef2d8ce;hpb=74ed4c043b3e22fa7e16fd892c381e9b16ca8c27

diff --git a/sbr/dtime.c b/sbr/dtime.c
index e0405e9..1d3bc06 100644
--- a/sbr/dtime.c
+++ b/sbr/dtime.c
@@ -6,19 +6,12 @@
 ** complete copyright information.
 */
 
+#include <time.h>
 #include <h/mh.h>   /* for snprintf() */
-#include <h/nmh.h>
 #include <h/tws.h>
-#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
 
 /*
@@ -46,12 +39,6 @@ char *tw_ldotw[] = {
 	"Saturday",  NULL
 };
 
-struct zone {
-	char *std;
-	char *dst;
-	int shift;
-};
-
 static int dmsize[] = {
 	31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
 };
@@ -85,10 +72,6 @@ dlocaltime(time_t *clock)
 	static struct tws tw;
 	struct tm *tm;
 
-#if !defined(HAVE_STRUCT_TM_TM_GMTOFF)
-	struct timeb tb;
-#endif
-
 	if (!clock)
 		return NULL;
 
@@ -100,10 +83,7 @@ dlocaltime(time_t *clock)
 	tw.tw_mday = tm->tm_mday;
 	tw.tw_mon  = tm->tm_mon;
 
-	/*
-	 * tm_year is always "year - 1900".
-	 * So we correct for this.
-	 */
+	/* tm_year is always "year - 1900". So we correct for this. */
 	tw.tw_year = tm->tm_year + 1900;
 	tw.tw_wday = tm->tm_wday;
 	tw.tw_yday = tm->tm_yday;
@@ -155,10 +135,7 @@ dgmtime(time_t *clock)
 	tw.tw_mday = tm->tm_mday;
 	tw.tw_mon  = tm->tm_mon;
 
-	/*
-	 * tm_year is always "year - 1900"
-	 * So we correct for this.
-	 */
+	/* tm_year is always "year - 1900". So we correct for this. */
 	tw.tw_year = tm->tm_year + 1900;
 	tw.tw_wday = tm->tm_wday;
 	tw.tw_yday = tm->tm_yday;
@@ -207,20 +184,17 @@ dctime(struct tws *tw)
 /*
 ** Produce a date/time string of the form
 **
-**    Mon, 16 Jun 1992 15:30:48 -700 (or)
-**    Mon, 16 Jun 1992 15:30:48 EDT
+**    Mon, 16 Jun 1992 15:30:48 -0700
 **
-** for the current time, as specified by rfc822.
-** The first form is required by rfc1123.
+** for the current time, as specified by rfc822 and rfc1123.
 */
-
 char *
-dtimenow(int alpha_timezone)
+dtimenow(void)
 {
 	time_t clock;
 
 	time(&clock);
-	return dtime(&clock, alpha_timezone);
+	return dtime(&clock);
 }
 
 
@@ -228,22 +202,14 @@ dtimenow(int alpha_timezone)
 ** Using a local calendar time value, produce
 ** a date/time string of the form
 **
-**    Mon, 16 Jun 1992 15:30:48 -700  (or)
-**    Mon, 16 Jun 1992 15:30:48 EDT
+**    Mon, 16 Jun 1992 15:30:48 -0700
 **
-** as specified by rfc822.  The first form is required
-** by rfc1123 for outgoing messages.
+** as specified by rfc822 and rfc1123.
 */
-
 char *
-dtime(time_t *clock, int alpha_timezone)
+dtime(time_t *clock)
 {
-	if (alpha_timezone)
-		/* use alpha-numeric timezones */
-		return dasctime(dlocaltime(clock), TW_NULL);
-	else
-		/* use numeric timezones */
-		return dasctime(dlocaltime(clock), TW_ZONE);
+	return dasctime(dlocaltime(clock));
 }
 
 
@@ -255,9 +221,8 @@ dtime(time_t *clock, int alpha_timezone)
 **
 ** as specified by rfc822 and rfc1123.
 */
-
 char *
-dasctime(struct tws *tw, int flags)
+dasctime(struct tws *tw)
 {
 	char buffer[80];
 	static char result[80];
@@ -269,7 +234,7 @@ dasctime(struct tws *tw, int flags)
 	if ((tw->tw_flags & TW_SZONE) == TW_SZNIL)
 		result[0] = '\0';
 	else
-		snprintf(result, sizeof(result), " %s", dtimezone(tw->tw_zone, tw->tw_flags | flags));
+		snprintf(result, sizeof(result), " %s", dtimezone(tw->tw_zone, tw->tw_flags));
 
 	snprintf(buffer, sizeof(buffer), "%02d %s %0*d %02d:%02d:%02d%s",
 		tw->tw_mday, tw_moty[tw->tw_mon],
@@ -289,9 +254,8 @@ dasctime(struct tws *tw, int flags)
 
 
 /*
-** Get the timezone for given offset
+** Get the timezone for given offset as numeric value.
 */
-
 char *
 dtimezone(int offset, int flags)
 {
@@ -306,11 +270,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;