X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fdtime.c;h=1d3bc060f33907d4a885fd80c1bbfb2baa808a4b;hp=737f998876fb1d3adc36e1cb05ac5cba46fede46;hb=f78e7c6e6e616cc4ff2bee8a726365fafef2d8ce;hpb=714b5c530ece27ea2835a313013f5b770163403c diff --git a/sbr/dtime.c b/sbr/dtime.c index 737f998..1d3bc06 100644 --- a/sbr/dtime.c +++ b/sbr/dtime.c @@ -6,33 +6,12 @@ ** complete copyright information. */ +#include #include /* for snprintf() */ -#include #include -#if !defined(HAVE_STRUCT_TM_TM_GMTOFF) && !defined(HAVE_TZSET) -# include -#endif - -#ifdef TIME_WITH_SYS_TIME -# include -# include -#else -# ifdef HAVE_SYS_TIME_H -# include -# else -# include -# 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 -# define abs(a) (a >= 0 ? a : -a) #endif /* @@ -60,52 +39,6 @@ char *tw_ldotw[] = { "Saturday", NULL }; -struct zone { - char *std; - char *dst; - 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 +72,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; @@ -154,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; @@ -171,13 +97,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; @@ -214,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; @@ -266,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); } @@ -287,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)); } @@ -314,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]; @@ -328,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], @@ -348,14 +254,12 @@ 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) { int hours, mins; - struct zone *z; static char buffer[10]; if (offset < 0) { @@ -366,17 +270,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 +371,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 }