X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/c762fa39172dee2133e0a5d6324464a4fa3cff50..86d4dcea853d7e37ff2615b793e3cb5dce7e3af0:/sbr/dtime.c?ds=sidebyside diff --git a/sbr/dtime.c b/sbr/dtime.c index 89f5dde8..0ed012b6 100644 --- a/sbr/dtime.c +++ b/sbr/dtime.c @@ -1,26 +1,36 @@ - -/* - * dtime.c -- time/date routines +/* dtime.c -- time/date routines * * 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 /* for snprintf() */ -#include -#include +#include "h/mh.h" +#include "dtime.h" +#include "h/nmh.h" +#include "h/utils.h" +#include "h/tws.h" #include #if !defined(HAVE_STRUCT_TM_TM_GMTOFF) extern long timezone; #endif +/* Size of largest possible int representing a time zone offset in minutes: + 2,147,483,648 / 60 = 35,791,394 */ +#define DTZ_BUFFER_SIZE (sizeof "+3579139459") + +/* + * 1 if leap year, 0 otherwise. + */ +#define isleapyear01(y) \ + (((y) % 4) ? 0 : (((y) % 100) ? 1 : (((y) % 400) ? 0 : 1))) + /* * The number of days in the year, accounting for leap years */ #define dysize(y) \ - (((y) % 4) ? 365 : (((y) % 100) ? 366 : (((y) % 400) ? 365 : 366))) + (365 + isleapyear01(y)) char *tw_moty[] = { "Jan", "Feb", "Mar", "Apr", @@ -41,14 +51,13 @@ 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 +static int dmsize[][12] = { + { /* Not a leap year */ + 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 + }, + { /* Leap year: February = 29 */ + 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 + } }; @@ -121,12 +130,11 @@ dlocaltime (time_t *clock) tw.tw_flags &= ~TW_SDAY; tw.tw_flags |= TW_SEXP; - tw.tw_flags &= ~TW_SZONE; tw.tw_flags |= TW_SZEXP; tw.tw_clock = *clock; - return (&tw); + return &tw; } @@ -169,12 +177,11 @@ dgmtime (time_t *clock) tw.tw_flags &= ~TW_SDAY; tw.tw_flags |= TW_SEXP; - tw.tw_flags &= ~TW_SZONE; tw.tw_flags |= TW_SZEXP; tw.tw_clock = *clock; - return (&tw); + return &tw; } @@ -193,10 +200,10 @@ dctime (struct tws *tw) if (!tw) return NULL; - snprintf (buffer, sizeof(buffer), "%.3s %.3s %02d %02d:%02d:%02d %.4d\n", + snprintf (buffer, sizeof(buffer), "%.3s %.3s %02d %02d:%02d:%02d %s\n", tw_dotw[tw->tw_wday], tw_moty[tw->tw_mon], tw->tw_mday, tw->tw_hour, tw->tw_min, tw->tw_sec, - tw->tw_year < 100 ? tw->tw_year + 1900 : tw->tw_year); + m_strn(tw->tw_year < 100 ? tw->tw_year + 1900 : tw->tw_year, 4)); return buffer; } @@ -208,8 +215,8 @@ dctime (struct tws *tw) * Mon, 16 Jun 1992 15:30:48 -700 (or) * Mon, 16 Jun 1992 15:30:48 EDT * - * for the current time, as specified by rfc822. - * The first form is required by rfc1123. + * for the current time, as specified by RFC 822. + * The first form is required by RFC 1123. */ char * @@ -229,8 +236,8 @@ dtimenow (int alpha_timezone) * Mon, 16 Jun 1992 15:30:48 -700 (or) * Mon, 16 Jun 1992 15:30:48 EDT * - * as specified by rfc822. The first form is required - * by rfc1123 for outgoing messages. + * as specified by RFC 822. The first form is required + * by RFC 1123 for outgoing messages. */ char * @@ -251,36 +258,38 @@ dtime (time_t *clock, int alpha_timezone) * * Mon, 16 Jun 1992 15:30:48 -0700 * - * as specified by rfc822 and rfc1123. + * as specified by RFC 822 and RFC 1123. */ char * dasctime (struct tws *tw, int flags) { - char buffer[80]; + char buffer[77]; + char tzbuffer[DTZ_BUFFER_SIZE]; static char result[80]; + int twf; if (!tw) return NULL; /* Display timezone if known */ - if ((tw->tw_flags & TW_SZONE) == TW_SZNIL) - result[0] = '\0'; + if (tw->tw_flags & TW_SZEXP) + snprintf(tzbuffer, sizeof(tzbuffer), " %s", dtimezone(tw->tw_zone, tw->tw_flags | flags)); else - snprintf(result, sizeof(result), " %s", dtimezone(tw->tw_zone, tw->tw_flags | flags)); + tzbuffer[0] = '\0'; snprintf(buffer, sizeof(buffer), "%02d %s %0*d %02d:%02d:%02d%s", tw->tw_mday, tw_moty[tw->tw_mon], tw->tw_year < 100 ? 2 : 4, tw->tw_year, - tw->tw_hour, tw->tw_min, tw->tw_sec, result); + tw->tw_hour, tw->tw_min, tw->tw_sec, tzbuffer); - if ((tw->tw_flags & TW_SDAY) == TW_SEXP) - snprintf (result, sizeof(result), "%s, %s", tw_dotw[tw->tw_wday], buffer); - else - if ((tw->tw_flags & TW_SDAY) == TW_SNIL) - strncpy (result, buffer, sizeof(result)); - else - snprintf (result, sizeof(result), "%s (%s)", buffer, tw_dotw[tw->tw_wday]); + if ((twf = tw->tw_flags & TW_SDAY)) { + if (twf == TW_SEXP) + snprintf(result, sizeof(result), "%s, %s", tw_dotw[tw->tw_wday], buffer); + else + snprintf(result, sizeof(result), "%s (%s)", buffer, tw_dotw[tw->tw_wday]); + } else + strncpy(result, buffer, sizeof(result)); return result; } @@ -294,29 +303,37 @@ dasctime (struct tws *tw, int flags) */ char * -dtimezone (int offset, int flags) +dtimezone(int offset, int flags) { - int hours, mins; - static char buffer[10]; - - if (offset < 0) { - mins = -((-offset) % 60); - hours = -((-offset) / 60); - } else { - mins = offset % 60; - hours = offset / 60; - } + static char buffer[DTZ_BUFFER_SIZE]; + bool pos; + unsigned os, hours, mins; + + pos = offset >= 0; + os = pos ? offset : ~offset + 1; /* abs(3) undefined on INT_MIN. */ + hours = os / 60; + mins = os % 60; + + if (flags & TW_DST) /* Shift towards +infinity. */ + hours += pos ? 1 : -1; + + snprintf(buffer, sizeof(buffer), "%c%02u%02u", + pos ? '+' : '-', hours, mins); -#ifdef ADJUST_NUMERIC_ONLY_TZ_OFFSETS_WRT_DST - if (flags & TW_DST) - hours += 1; -#endif /* ADJUST_NUMERIC_ONLY_TZ_OFFSETS_WRT_DST */ - snprintf (buffer, sizeof(buffer), "%s%02d%02d", - offset < 0 ? "-" : "+", abs (hours), abs (mins)); return buffer; } +/* + * Last day of month (1-12) in given year. + */ + +int +dmlastday(int year, int mon) +{ + return dmsize[isleapyear01 (year)][mon - 1]; +} + /* * Convert nmh time structure for local "broken-down" * time to calendar time (clock value). This routine @@ -327,7 +344,7 @@ dtimezone (int offset, int flags) time_t dmktime (struct tws *tw) { - int i, sec, min, hour, mday, mon, year; + int i, sec, min, hour, mday, mon, year, *msize; time_t result; if (tw->tw_clock != 0) @@ -351,19 +368,21 @@ dmktime (struct tws *tw) for (i = 1970; i < year; i++) result += dysize (i); - if (dysize (year) == 366 && mon >= 3) - result++; + msize = dmsize[isleapyear01 (year)]; while (--mon) - result += dmsize[mon - 1]; + result += msize[mon - 1]; result += mday - 1; - result = 24 * result + hour; - result = 60 * result + min; - result = 60 * result + sec; + result *= 24; /* Days to hours. */ + result += hour; + result *= 60; /* Hours to minutes. */ + result += min; + result *= 60; /* Minutes to seconds. */ + result += sec; result -= 60 * tw->tw_zone; if (tw->tw_flags & TW_DST) - result -= 60 * 60; + result -= 60 * 60; /* One hour. */ - return (tw->tw_clock = result); + return tw->tw_clock = result; } @@ -397,18 +416,8 @@ set_dotw (struct tws *tw) if (tw->tw_wday < 0) tw->tw_wday += 7; - tw->tw_flags &= ~TW_SDAY, tw->tw_flags |= TW_SIMP; -} - - -/* - * Copy nmh time structure - */ - -void -twscopy (struct tws *tb, struct tws *tw) -{ - *tb = *tw; /* struct copy */ + tw->tw_flags &= ~TW_SDAY; + tw->tw_flags |= TW_SIMP; } @@ -426,6 +435,6 @@ twsort (struct tws *tw1, struct tws *tw2) if (tw2->tw_clock == 0) dmktime (tw2); - return ((c1 = tw1->tw_clock) > (c2 = tw2->tw_clock) ? 1 - : c1 == c2 ? 0 : -1); + return (c1 = tw1->tw_clock) > (c2 = tw2->tw_clock) ? 1 + : c1 == c2 ? 0 : -1; }