mirror of
https://frontier.innolan.net/rainlance/amiga-tz.git
synced 2026-09-30 20:16:29 +00:00
Paul Eggert
f0133dd86a
I audited the code and fixed as many width-asssumptions as I could find, including several places where the code assumed that 'time_t' was no wider than 'long'; this assumption is not true on 32-bit NetBSD platforms. This caught every problem that is already fixed in the NetBSD zic.c, and caught quite a few more. * Makefile: Add comments re HAVE_DOS_FILE_NAMES and HAVE_INTTYPES_H. * date.c (checkfinal, netsettime): Don't use 'long' where 'int' will do. * difftime.c (difftime): Mark with ATTRIBUTE_CONST. Use uintmax_t, not unsigned long, for the widest unsigned integer type. Use long double, not double, if time_t is wider than uintmax_t; this can in theory help on nonstandard platforms, such as GCC with 64-bit uintmax_t and 128-bit __int128_t. * localtime.c (struct ttinfo.tt_gmtoff, struct rule.r_time) (detzcode, getsecs, getoffset, gmtsub, localsub, increment_overflow32) (normalize_overflow32, time1, time2, timesub, transtime, tzparse) (time2sub, timeoff, gtime): * tzfile.h (SECSPERDAY): * zdump.c (SECSPERDAY): * zic.c (convert, puttzcode): Use int_fast32_t, not long, when all we care is that values up to 2**31 can be stored. This doesn't fix any bugs, but it allows more opportunity for compiler optimization. (struct lsinfo.ls_corr, timesub, leapcorr): Use int_fast64_t, not long, when values up to 2**63 can be stored. (timesub): Make it clearer when we are truncating 0.5 to 0. (increment_overflow32): Rename from long_increment_overflow. All uses changed. (normalize_overflow32): Rename from long_normalize_overflow. All uses changed. * private.h (HAVE_INTTYPES_H, ATTRIBUTE_CONST): New macros. Include <inttypes.h> if HAVE_INTTYPES_H. (INT_FAST64_MIN, INT_FAST64_MAX, SCNdFAST64, int_fast32_t, PRIdMAX) (uintmax_t, PRIuMAX, _Noreturn): Define to reasonable values if it's an older compiler. * scheck.c (scheck): Add support for arbitrary formats, such as those that SCNdFAST64 can expand to, at the price of no longer supporting weird conversion specs like "%[%]". * strftime.c (_fmt): Use intmax_t and uintmax_t to format time_t, not long and unsigned long. * zdump.c (int_fast32_t, intmax_t, PRIdMAX, SCNdMAX): Define for pre-C99 compilers, like private.h does. (delta, yeartot, main): Use intmax_t, not long. (hunt): Use time_t, not long, since the diff must be nonnegative. (tformat): Allow for time_t wider than long. * zic.c (ZIC_MIN, ZIC_MAX, SCNdZIC): New macros. (OFFSET_STRLEN_MAXIMUM, RULE_STRLEN_MAXIMUM): Remove. (struct rule): Make r_loyear, r_hiyear, r_tod, r_stdoff, z_gmtoff, z_stdoff zic_t, not long. (addtype, gethms, oadd, rpytime, tadd, gmtoffs, corr, inleap) (stringoffset, stringrule, outzone, addtype, adjleap, rpytime) (LDAYSPERWEEK): Use zic_t, not long. (leapminyear, leapmaxyear, min_year, max_year, rulesub, updateminmax) (outzone, rpytime): Use zic_t, not int. (usage): Now _Noreturn. (main): Use S_IWGRP, not 'unix', to determine whether to call umask. (writezone): Omit unnecessary cast. (mkdirs): Use HAVE_DOS_FILE_NAMES, not 'unix', to determine whether to parse DOS file anmes. (eitol): Remove; no longer needed.
171 lines
4.8 KiB
C
171 lines
4.8 KiB
C
#ifndef TZFILE_H
|
|
|
|
#define TZFILE_H
|
|
|
|
/*
|
|
** This file is in the public domain, so clarified as of
|
|
** 1996-06-05 by Arthur David Olson.
|
|
*/
|
|
|
|
/*
|
|
** This header is for use ONLY with the time conversion code.
|
|
** There is no guarantee that it will remain unchanged,
|
|
** or that it will remain at all.
|
|
** Do NOT copy it to any system include directory.
|
|
** Thank you!
|
|
*/
|
|
|
|
/*
|
|
** Information about time zone files.
|
|
*/
|
|
|
|
#ifndef TZDIR
|
|
#define TZDIR "/usr/local/etc/zoneinfo" /* Time zone object file directory */
|
|
#endif /* !defined TZDIR */
|
|
|
|
#ifndef TZDEFAULT
|
|
#define TZDEFAULT "localtime"
|
|
#endif /* !defined TZDEFAULT */
|
|
|
|
#ifndef TZDEFRULES
|
|
#define TZDEFRULES "posixrules"
|
|
#endif /* !defined TZDEFRULES */
|
|
|
|
/*
|
|
** Each file begins with. . .
|
|
*/
|
|
|
|
#define TZ_MAGIC "TZif"
|
|
|
|
struct tzhead {
|
|
char tzh_magic[4]; /* TZ_MAGIC */
|
|
char tzh_version[1]; /* '\0' or '2' as of 2005 */
|
|
char tzh_reserved[15]; /* reserved--must be zero */
|
|
char tzh_ttisgmtcnt[4]; /* coded number of trans. time flags */
|
|
char tzh_ttisstdcnt[4]; /* coded number of trans. time flags */
|
|
char tzh_leapcnt[4]; /* coded number of leap seconds */
|
|
char tzh_timecnt[4]; /* coded number of transition times */
|
|
char tzh_typecnt[4]; /* coded number of local time types */
|
|
char tzh_charcnt[4]; /* coded number of abbr. chars */
|
|
};
|
|
|
|
/*
|
|
** . . .followed by. . .
|
|
**
|
|
** tzh_timecnt (char [4])s coded transition times a la time(2)
|
|
** tzh_timecnt (unsigned char)s types of local time starting at above
|
|
** tzh_typecnt repetitions of
|
|
** one (char [4]) coded UTC offset in seconds
|
|
** one (unsigned char) used to set tm_isdst
|
|
** one (unsigned char) that's an abbreviation list index
|
|
** tzh_charcnt (char)s '\0'-terminated zone abbreviations
|
|
** tzh_leapcnt repetitions of
|
|
** one (char [4]) coded leap second transition times
|
|
** one (char [4]) total correction after above
|
|
** tzh_ttisstdcnt (char)s indexed by type; if TRUE, transition
|
|
** time is standard time, if FALSE,
|
|
** transition time is wall clock time
|
|
** if absent, transition times are
|
|
** assumed to be wall clock time
|
|
** tzh_ttisgmtcnt (char)s indexed by type; if TRUE, transition
|
|
** time is UTC, if FALSE,
|
|
** transition time is local time
|
|
** if absent, transition times are
|
|
** assumed to be local time
|
|
*/
|
|
|
|
/*
|
|
** If tzh_version is '2' or greater, the above is followed by a second instance
|
|
** of tzhead and a second instance of the data in which each coded transition
|
|
** time uses 8 rather than 4 chars,
|
|
** then a POSIX-TZ-environment-variable-style string for use in handling
|
|
** instants after the last transition time stored in the file
|
|
** (with nothing between the newlines if there is no POSIX representation for
|
|
** such instants).
|
|
*/
|
|
|
|
/*
|
|
** In the current implementation, "tzset()" refuses to deal with files that
|
|
** exceed any of the limits below.
|
|
*/
|
|
|
|
#ifndef TZ_MAX_TIMES
|
|
#define TZ_MAX_TIMES 1200
|
|
#endif /* !defined TZ_MAX_TIMES */
|
|
|
|
#ifndef TZ_MAX_TYPES
|
|
#ifndef NOSOLAR
|
|
#define TZ_MAX_TYPES 256 /* Limited by what (unsigned char)'s can hold */
|
|
#endif /* !defined NOSOLAR */
|
|
#ifdef NOSOLAR
|
|
/*
|
|
** Must be at least 14 for Europe/Riga as of Jan 12 1995,
|
|
** as noted by Earl Chew.
|
|
*/
|
|
#define TZ_MAX_TYPES 20 /* Maximum number of local time types */
|
|
#endif /* !defined NOSOLAR */
|
|
#endif /* !defined TZ_MAX_TYPES */
|
|
|
|
#ifndef TZ_MAX_CHARS
|
|
#define TZ_MAX_CHARS 50 /* Maximum number of abbreviation characters */
|
|
/* (limited by what unsigned chars can hold) */
|
|
#endif /* !defined TZ_MAX_CHARS */
|
|
|
|
#ifndef TZ_MAX_LEAPS
|
|
#define TZ_MAX_LEAPS 50 /* Maximum number of leap second corrections */
|
|
#endif /* !defined TZ_MAX_LEAPS */
|
|
|
|
#define SECSPERMIN 60
|
|
#define MINSPERHOUR 60
|
|
#define HOURSPERDAY 24
|
|
#define DAYSPERWEEK 7
|
|
#define DAYSPERNYEAR 365
|
|
#define DAYSPERLYEAR 366
|
|
#define SECSPERHOUR (SECSPERMIN * MINSPERHOUR)
|
|
#define SECSPERDAY ((int_fast32_t) SECSPERHOUR * HOURSPERDAY)
|
|
#define MONSPERYEAR 12
|
|
|
|
#define TM_SUNDAY 0
|
|
#define TM_MONDAY 1
|
|
#define TM_TUESDAY 2
|
|
#define TM_WEDNESDAY 3
|
|
#define TM_THURSDAY 4
|
|
#define TM_FRIDAY 5
|
|
#define TM_SATURDAY 6
|
|
|
|
#define TM_JANUARY 0
|
|
#define TM_FEBRUARY 1
|
|
#define TM_MARCH 2
|
|
#define TM_APRIL 3
|
|
#define TM_MAY 4
|
|
#define TM_JUNE 5
|
|
#define TM_JULY 6
|
|
#define TM_AUGUST 7
|
|
#define TM_SEPTEMBER 8
|
|
#define TM_OCTOBER 9
|
|
#define TM_NOVEMBER 10
|
|
#define TM_DECEMBER 11
|
|
|
|
#define TM_YEAR_BASE 1900
|
|
|
|
#define EPOCH_YEAR 1970
|
|
#define EPOCH_WDAY TM_THURSDAY
|
|
|
|
#define isleap(y) (((y) % 4) == 0 && (((y) % 100) != 0 || ((y) % 400) == 0))
|
|
|
|
/*
|
|
** Since everything in isleap is modulo 400 (or a factor of 400), we know that
|
|
** isleap(y) == isleap(y % 400)
|
|
** and so
|
|
** isleap(a + b) == isleap((a + b) % 400)
|
|
** or
|
|
** isleap(a + b) == isleap(a % 400 + b % 400)
|
|
** This is true even if % means modulo rather than Fortran remainder
|
|
** (which is allowed by C89 but not C99).
|
|
** We use this to avoid addition overflow problems.
|
|
*/
|
|
|
|
#define isleap_sum(a, b) isleap((a) % 400 + (b) % 400)
|
|
|
|
#endif /* !defined TZFILE_H */
|