diff options
Diffstat (limited to 'src/timezone/zic.c')
| -rw-r--r-- | src/timezone/zic.c | 1986 |
1 files changed, 1135 insertions, 851 deletions
diff --git a/src/timezone/zic.c b/src/timezone/zic.c index 490d133fb7a..16e44ad6a7f 100644 --- a/src/timezone/zic.c +++ b/src/timezone/zic.c @@ -23,11 +23,11 @@ #endif #endif -static char elsieid[] = "@(#)zic.c 7.115"; +static char elsieid[] = "@(#)zic.c 7.115"; /* ** On some ancient hosts, predicates like `isspace(C)' are defined -** only if isascii(C) || C == EOF. Modern hosts obey the C Standard, +** only if isascii(C) || C == EOF. Modern hosts obey the C Standard, ** which says they are defined only if C == ((unsigned char) C) || C == EOF. ** Neither the C Standard nor Posix require that `isascii' exist. ** For portability, we check both ancient and modern requirements. @@ -38,128 +38,130 @@ static char elsieid[] = "@(#)zic.c 7.115"; #define isascii(x) 1 #endif -struct rule { - const char * r_filename; - int r_linenum; - const char * r_name; - - int r_loyear; /* for example, 1986 */ - int r_hiyear; /* for example, 1986 */ - const char * r_yrtype; - - int r_month; /* 0..11 */ - - int r_dycode; /* see below */ - int r_dayofmonth; - int r_wday; - - long r_tod; /* time from midnight */ - int r_todisstd; /* above is standard time if TRUE */ - /* or wall clock time if FALSE */ - int r_todisgmt; /* above is GMT if TRUE */ - /* or local time if FALSE */ - long r_stdoff; /* offset from standard time */ - const char * r_abbrvar; /* variable part of abbreviation */ - - int r_todo; /* a rule to do (used in outzone) */ - time_t r_temp; /* used in outzone */ +struct rule +{ + const char *r_filename; + int r_linenum; + const char *r_name; + + int r_loyear; /* for example, 1986 */ + int r_hiyear; /* for example, 1986 */ + const char *r_yrtype; + + int r_month; /* 0..11 */ + + int r_dycode; /* see below */ + int r_dayofmonth; + int r_wday; + + long r_tod; /* time from midnight */ + int r_todisstd; /* above is standard time if TRUE */ + /* or wall clock time if FALSE */ + int r_todisgmt; /* above is GMT if TRUE */ + /* or local time if FALSE */ + long r_stdoff; /* offset from standard time */ + const char *r_abbrvar; /* variable part of abbreviation */ + + int r_todo; /* a rule to do (used in outzone) */ + time_t r_temp; /* used in outzone */ }; /* ** r_dycode r_dayofmonth r_wday */ -#define DC_DOM 0 /* 1..31 */ /* unused */ -#define DC_DOWGEQ 1 /* 1..31 */ /* 0..6 (Sun..Sat) */ -#define DC_DOWLEQ 2 /* 1..31 */ /* 0..6 (Sun..Sat) */ +#define DC_DOM 0 /* 1..31 */ /* unused */ +#define DC_DOWGEQ 1 /* 1..31 */ /* 0..6 (Sun..Sat) */ +#define DC_DOWLEQ 2 /* 1..31 */ /* 0..6 (Sun..Sat) */ -struct zone { - const char * z_filename; - int z_linenum; +struct zone +{ + const char *z_filename; + int z_linenum; - const char * z_name; + const char *z_name; long z_gmtoff; - const char * z_rule; - const char * z_format; + const char *z_rule; + const char *z_format; long z_stdoff; - struct rule * z_rules; - int z_nrules; + struct rule *z_rules; + int z_nrules; - struct rule z_untilrule; + struct rule z_untilrule; time_t z_untiltime; }; -extern int link (const char * fromname, const char * toname); -static void addtt (time_t starttime, int type); -static int addtype (long gmtoff, const char * abbr, int isdst, - int ttisstd, int ttisgmt); -static void leapadd (time_t t, int positive, int rolling, int count); -static void adjleap (void); -static void associate (void); -static int ciequal (const char * ap, const char * bp); -static void convert (long val, char * buf); -static void dolink (const char * fromfile, const char * tofile); -static void doabbr (char * abbr, const char * format, - const char * letters, int isdst); -static void eat (const char * name, int num); -static void eats (const char * name, int num, - const char * rname, int rnum); -static long eitol (int i); -static void error (const char * message); -static char ** getfields (char * buf); -static long gethms (const char * string, const char * errstrng, - int signable); -static void infile (const char * filename); -static void inleap (char ** fields, int nfields); -static void inlink (char ** fields, int nfields); -static void inrule (char ** fields, int nfields); -static int inzcont (char ** fields, int nfields); -static int inzone (char ** fields, int nfields); -static int inzsub (char ** fields, int nfields, int iscont); -static int itsabbr (const char * abbr, const char * word); -static int itsdir (const char * name); -static int lowerit (int c); -static char * memcheck (char * tocheck); -static int mkdirs (char * filename); -static void newabbr (const char * abbr); -static long oadd (long t1, long t2); -static void outzone (const struct zone * zp, int ntzones); -static void puttzcode (long code, FILE * fp); -static int rcomp (const void * leftp, const void * rightp); -static time_t rpytime (const struct rule * rp, int wantedy); -static void rulesub (struct rule * rp, - const char * loyearp, const char * hiyearp, - const char * typep, const char * monthp, - const char * dayp, const char * timep); -static void setboundaries (void); -static time_t tadd (time_t t1, long t2); -static void usage (void); -static void writezone (const char * name); -static int yearistype (int year, const char * type); +extern int link(const char *fromname, const char *toname); +static void addtt(time_t starttime, int type); +static int addtype(long gmtoff, const char *abbr, int isdst, + int ttisstd, int ttisgmt); +static void leapadd(time_t t, int positive, int rolling, int count); +static void adjleap(void); +static void associate(void); +static int ciequal(const char *ap, const char *bp); +static void convert(long val, char *buf); +static void dolink(const char *fromfile, const char *tofile); +static void doabbr(char *abbr, const char *format, + const char *letters, int isdst); +static void eat(const char *name, int num); +static void eats(const char *name, int num, + const char *rname, int rnum); +static long eitol(int i); +static void error(const char *message); +static char **getfields(char *buf); +static long gethms(const char *string, const char *errstrng, + int signable); +static void infile(const char *filename); +static void inleap(char **fields, int nfields); +static void inlink(char **fields, int nfields); +static void inrule(char **fields, int nfields); +static int inzcont(char **fields, int nfields); +static int inzone(char **fields, int nfields); +static int inzsub(char **fields, int nfields, int iscont); +static int itsabbr(const char *abbr, const char *word); +static int itsdir(const char *name); +static int lowerit(int c); +static char *memcheck(char *tocheck); +static int mkdirs(char *filename); +static void newabbr(const char *abbr); +static long oadd(long t1, long t2); +static void outzone(const struct zone * zp, int ntzones); +static void puttzcode(long code, FILE *fp); +static int rcomp(const void *leftp, const void *rightp); +static time_t rpytime(const struct rule * rp, int wantedy); +static void rulesub(struct rule * rp, + const char *loyearp, const char *hiyearp, + const char *typep, const char *monthp, + const char *dayp, const char *timep); +static void setboundaries(void); +static time_t tadd(time_t t1, long t2); +static void usage(void); +static void writezone(const char *name); +static int yearistype(int year, const char *type); #ifndef HAVE_STRERROR -static char * strerror (int); +static char *strerror(int); #endif -static int charcnt; -static int errors; -static const char * filename; -static int leapcnt; -static int linenum; -static time_t max_time; -static int max_year; -static int max_year_representable; -static time_t min_time; -static int min_year; -static int min_year_representable; -static int noise; -static const char * rfilename; -static int rlinenum; -static const char * progname; -static int timecnt; -static int typecnt; +static int charcnt; +static int errors; +static const char *filename; +static int leapcnt; +static int linenum; +static time_t max_time; +static int max_year; +static int max_year_representable; +static time_t min_time; +static int min_year; +static int min_year_representable; +static int noise; +static const char *rfilename; +static int rlinenum; +static const char *progname; +static int timecnt; +static int typecnt; /* ** Line codes. @@ -179,7 +181,7 @@ static int typecnt; #define ZF_RULE 3 #define ZF_FORMAT 4 #define ZF_TILYEAR 5 -#define ZF_TILMONTH 6 +#define ZF_TILMONTH 6 #define ZF_TILDAY 7 #define ZF_TILTIME 8 #define ZONE_MINFIELDS 5 @@ -192,12 +194,12 @@ static int typecnt; #define ZFC_GMTOFF 0 #define ZFC_RULE 1 #define ZFC_FORMAT 2 -#define ZFC_TILYEAR 3 +#define ZFC_TILYEAR 3 #define ZFC_TILMONTH 4 #define ZFC_TILDAY 5 -#define ZFC_TILTIME 6 -#define ZONEC_MINFIELDS 3 -#define ZONEC_MAXFIELDS 7 +#define ZFC_TILTIME 6 +#define ZONEC_MINFIELDS 3 +#define ZONEC_MAXFIELDS 7 /* ** Which files are which on a Rule line. @@ -212,7 +214,7 @@ static int typecnt; #define RF_TOD 7 #define RF_STDOFF 8 #define RF_ABBRVAR 9 -#define RULE_FIELDS 10 +#define RULE_FIELDS 10 /* ** Which fields are which on a Link line. @@ -220,7 +222,7 @@ static int typecnt; #define LF_FROM 1 #define LF_TO 2 -#define LINK_FIELDS 3 +#define LINK_FIELDS 3 /* ** Which fields are which on a Leap line. @@ -232,7 +234,7 @@ static int typecnt; #define LP_TIME 4 #define LP_CORR 5 #define LP_ROLL 6 -#define LEAP_FIELDS 7 +#define LEAP_FIELDS 7 /* ** Year synonyms. @@ -242,117 +244,120 @@ static int typecnt; #define YR_MAXIMUM 1 #define YR_ONLY 2 -static struct rule * rules; -static int nrules; /* number of rules */ +static struct rule *rules; +static int nrules; /* number of rules */ -static struct zone * zones; -static int nzones; /* number of zones */ +static struct zone *zones; +static int nzones; /* number of zones */ -struct link { - const char * l_filename; - int l_linenum; - const char * l_from; - const char * l_to; +struct link +{ + const char *l_filename; + int l_linenum; + const char *l_from; + const char *l_to; }; -static struct link * links; -static int nlinks; +static struct link *links; +static int nlinks; -struct lookup { - const char * l_word; +struct lookup +{ + const char *l_word; const int l_value; }; -static struct lookup const * byword (const char * string, - const struct lookup * lp); +static struct lookup const *byword(const char *string, + const struct lookup * lp); -static struct lookup const line_codes[] = { - { "Rule", LC_RULE }, - { "Zone", LC_ZONE }, - { "Link", LC_LINK }, - { "Leap", LC_LEAP }, - { NULL, 0} +static struct lookup const line_codes[] = { + {"Rule", LC_RULE}, + {"Zone", LC_ZONE}, + {"Link", LC_LINK}, + {"Leap", LC_LEAP}, + {NULL, 0} }; -static struct lookup const mon_names[] = { - { "January", TM_JANUARY }, - { "February", TM_FEBRUARY }, - { "March", TM_MARCH }, - { "April", TM_APRIL }, - { "May", TM_MAY }, - { "June", TM_JUNE }, - { "July", TM_JULY }, - { "August", TM_AUGUST }, - { "September", TM_SEPTEMBER }, - { "October", TM_OCTOBER }, - { "November", TM_NOVEMBER }, - { "December", TM_DECEMBER }, - { NULL, 0 } +static struct lookup const mon_names[] = { + {"January", TM_JANUARY}, + {"February", TM_FEBRUARY}, + {"March", TM_MARCH}, + {"April", TM_APRIL}, + {"May", TM_MAY}, + {"June", TM_JUNE}, + {"July", TM_JULY}, + {"August", TM_AUGUST}, + {"September", TM_SEPTEMBER}, + {"October", TM_OCTOBER}, + {"November", TM_NOVEMBER}, + {"December", TM_DECEMBER}, + {NULL, 0} }; -static struct lookup const wday_names[] = { - { "Sunday", TM_SUNDAY }, - { "Monday", TM_MONDAY }, - { "Tuesday", TM_TUESDAY }, - { "Wednesday", TM_WEDNESDAY }, - { "Thursday", TM_THURSDAY }, - { "Friday", TM_FRIDAY }, - { "Saturday", TM_SATURDAY }, - { NULL, 0 } +static struct lookup const wday_names[] = { + {"Sunday", TM_SUNDAY}, + {"Monday", TM_MONDAY}, + {"Tuesday", TM_TUESDAY}, + {"Wednesday", TM_WEDNESDAY}, + {"Thursday", TM_THURSDAY}, + {"Friday", TM_FRIDAY}, + {"Saturday", TM_SATURDAY}, + {NULL, 0} }; -static struct lookup const lasts[] = { - { "last-Sunday", TM_SUNDAY }, - { "last-Monday", TM_MONDAY }, - { "last-Tuesday", TM_TUESDAY }, - { "last-Wednesday", TM_WEDNESDAY }, - { "last-Thursday", TM_THURSDAY }, - { "last-Friday", TM_FRIDAY }, - { "last-Saturday", TM_SATURDAY }, - { NULL, 0 } +static struct lookup const lasts[] = { + {"last-Sunday", TM_SUNDAY}, + {"last-Monday", TM_MONDAY}, + {"last-Tuesday", TM_TUESDAY}, + {"last-Wednesday", TM_WEDNESDAY}, + {"last-Thursday", TM_THURSDAY}, + {"last-Friday", TM_FRIDAY}, + {"last-Saturday", TM_SATURDAY}, + {NULL, 0} }; -static struct lookup const begin_years[] = { - { "minimum", YR_MINIMUM }, - { "maximum", YR_MAXIMUM }, - { NULL, 0 } +static struct lookup const begin_years[] = { + {"minimum", YR_MINIMUM}, + {"maximum", YR_MAXIMUM}, + {NULL, 0} }; -static struct lookup const end_years[] = { - { "minimum", YR_MINIMUM }, - { "maximum", YR_MAXIMUM }, - { "only", YR_ONLY }, - { NULL, 0 } +static struct lookup const end_years[] = { + {"minimum", YR_MINIMUM}, + {"maximum", YR_MAXIMUM}, + {"only", YR_ONLY}, + {NULL, 0} }; -static struct lookup const leap_types[] = { - { "Rolling", TRUE }, - { "Stationary", FALSE }, - { NULL, 0 } +static struct lookup const leap_types[] = { + {"Rolling", TRUE}, + {"Stationary", FALSE}, + {NULL, 0} }; -static const int len_months[2][MONSPERYEAR] = { - { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }, - { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 } +static const int len_months[2][MONSPERYEAR] = { + {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}, + {31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31} }; -static const int len_years[2] = { +static const int len_years[2] = { DAYSPERNYEAR, DAYSPERLYEAR }; -static struct attype { +static struct attype +{ time_t at; - unsigned char type; -} attypes[TZ_MAX_TIMES]; -static long gmtoffs[TZ_MAX_TYPES]; -static char isdsts[TZ_MAX_TYPES]; -static unsigned char abbrinds[TZ_MAX_TYPES]; -static char ttisstds[TZ_MAX_TYPES]; -static char ttisgmts[TZ_MAX_TYPES]; -static char chars[TZ_MAX_CHARS]; -static time_t trans[TZ_MAX_LEAPS]; -static long corr[TZ_MAX_LEAPS]; -static char roll[TZ_MAX_LEAPS]; + unsigned char type; +} attypes[TZ_MAX_TIMES]; +static long gmtoffs[TZ_MAX_TYPES]; +static char isdsts[TZ_MAX_TYPES]; +static unsigned char abbrinds[TZ_MAX_TYPES]; +static char ttisstds[TZ_MAX_TYPES]; +static char ttisgmts[TZ_MAX_TYPES]; +static char chars[TZ_MAX_CHARS]; +static time_t trans[TZ_MAX_LEAPS]; +static long corr[TZ_MAX_LEAPS]; +static char roll[TZ_MAX_LEAPS]; /* ** Memory allocation. @@ -360,20 +365,21 @@ static char roll[TZ_MAX_LEAPS]; static char * memcheck(ptr) -char * const ptr; +char *const ptr; { - if (ptr == NULL) { + if (ptr == NULL) + { const char *e = strerror(errno); (void) fprintf(stderr, _("%s: Memory exhausted: %s\n"), - progname, e); + progname, e); (void) exit(EXIT_FAILURE); } return ptr; } #define emalloc(size) memcheck(imalloc(size)) -#define erealloc(ptr, size) memcheck(irealloc((ptr), (size))) +#define erealloc(ptr, size) memcheck(irealloc((ptr), (size))) #define ecpyalloc(ptr) memcheck(icpyalloc(ptr)) #define ecatalloc(oldp, newp) memcheck(icatalloc((oldp), (newp))) @@ -382,9 +388,10 @@ char * const ptr; */ #ifndef HAVE_STRERROR -static char *strerror(int errnum) +static char * +strerror(int errnum) { - extern char * sys_errlist[]; + extern char *sys_errlist[]; extern int sys_nerr; return (errnum > 0 && errnum <= sys_nerr) ? @@ -392,7 +399,8 @@ static char *strerror(int errnum) } #endif -static void eats(const char *name, const int num, const char *rname, const int rnum) +static void +eats(const char *name, const int num, const char *rname, const int rnum) { filename = name; linenum = num; @@ -400,30 +408,32 @@ static void eats(const char *name, const int num, const char *rname, const int r rlinenum = rnum; } -static void eat(const char *name, const int num) +static void +eat(const char *name, const int num) { eats(name, num, (char *) NULL, -1); } -static void error(const char *string) +static void +error(const char *string) { /* - ** Match the format of "cc" to allow sh users to - ** zic ... 2>&1 | error -t "*" -v - ** on BSD systems. - */ + * * Match the format of "cc" to allow sh users to * zic ... 2>&1 | + * error -t "*" -v * on BSD systems. + */ (void) fprintf(stderr, _("\"%s\", line %d: %s"), - filename, linenum, string); + filename, linenum, string); if (rfilename != NULL) (void) fprintf(stderr, _(" (rule from \"%s\", line %d)"), - rfilename, rlinenum); + rfilename, rlinenum); (void) fprintf(stderr, "\n"); ++errors; } -static void warning(const char *string) +static void +warning(const char *string) { - char * cp; + char *cp; cp = ecpyalloc(_("warning: ")); cp = ecatalloc(cp, string); @@ -432,86 +442,95 @@ static void warning(const char *string) --errors; } -static void usage(void) +static void +usage(void) { (void) fprintf(stderr, _("%s: usage is %s [ --version ] [ -s ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n\t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n"), - progname, progname); + progname, progname); (void) exit(EXIT_FAILURE); } -static const char * psxrules; -static const char * lcltime; -static const char * directory; -static const char * leapsec; -static const char * yitcommand; -static int sflag = FALSE; +static const char *psxrules; +static const char *lcltime; +static const char *directory; +static const char *leapsec; +static const char *yitcommand; +static int sflag = FALSE; -int main(int argc, char *argv[]) +int +main(int argc, char *argv[]) { - register int i; - register int j; - register int c; + register int i; + register int j; + register int c; #ifndef WIN32 (void) umask(umask(S_IWGRP | S_IWOTH) | (S_IWGRP | S_IWOTH)); -#endif /* !WIN32 */ +#endif /* !WIN32 */ progname = argv[0]; for (i = 1; i < argc; ++i) - if (strcmp(argv[i], "--version") == 0) { + if (strcmp(argv[i], "--version") == 0) + { (void) printf("%s\n", elsieid); (void) exit(EXIT_SUCCESS); } while ((c = getopt(argc, argv, "d:l:p:L:vsy:")) != EOF && c != -1) - switch (c) { + switch (c) + { default: usage(); case 'd': if (directory == NULL) directory = optarg; - else { + else + { (void) fprintf(stderr, -_("%s: More than one -d option specified\n"), - progname); + _("%s: More than one -d option specified\n"), + progname); (void) exit(EXIT_FAILURE); } break; case 'l': if (lcltime == NULL) lcltime = optarg; - else { + else + { (void) fprintf(stderr, -_("%s: More than one -l option specified\n"), - progname); + _("%s: More than one -l option specified\n"), + progname); (void) exit(EXIT_FAILURE); } break; case 'p': if (psxrules == NULL) psxrules = optarg; - else { + else + { (void) fprintf(stderr, -_("%s: More than one -p option specified\n"), - progname); + _("%s: More than one -p option specified\n"), + progname); (void) exit(EXIT_FAILURE); } break; case 'y': if (yitcommand == NULL) yitcommand = optarg; - else { + else + { (void) fprintf(stderr, -_("%s: More than one -y option specified\n"), - progname); + _("%s: More than one -y option specified\n"), + progname); (void) exit(EXIT_FAILURE); } break; case 'L': if (leapsec == NULL) leapsec = optarg; - else { + else + { (void) fprintf(stderr, -_("%s: More than one -L option specified\n"), - progname); + _("%s: More than one -L option specified\n"), + progname); (void) exit(EXIT_FAILURE); } break; @@ -523,7 +542,7 @@ _("%s: More than one -L option specified\n"), break; } if (optind == argc - 1 && strcmp(argv[optind], "=") == 0) - usage(); /* usage message by request */ + usage(); /* usage message by request */ if (directory == NULL) directory = "data"; if (yitcommand == NULL) @@ -531,7 +550,8 @@ _("%s: More than one -L option specified\n"), setboundaries(); - if (optind < argc && leapsec != NULL) { + if (optind < argc && leapsec != NULL) + { infile(leapsec); adjleap(); } @@ -541,59 +561,69 @@ _("%s: More than one -L option specified\n"), if (errors) (void) exit(EXIT_FAILURE); associate(); - for (i = 0; i < nzones; i = j) { + for (i = 0; i < nzones; i = j) + { /* - ** Find the next non-continuation zone entry. - */ + * * Find the next non-continuation zone entry. + */ for (j = i + 1; j < nzones && zones[j].z_name == NULL; ++j) continue; outzone(&zones[i], j - i); } + /* - ** Make links. - */ - for (i = 0; i < nlinks; ++i) { + * * Make links. + */ + for (i = 0; i < nlinks; ++i) + { eat(links[i].l_filename, links[i].l_linenum); dolink(links[i].l_from, links[i].l_to); } - if (lcltime != NULL) { + if (lcltime != NULL) + { eat("command line", 1); dolink(lcltime, TZDEFAULT); } - if (psxrules != NULL) { + if (psxrules != NULL) + { eat("command line", 1); dolink(psxrules, TZDEFRULES); } return (errors == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } -static void dolink(const char *fromfile, const char *tofile) +static void +dolink(const char *fromfile, const char *tofile) { - register char * fromname; - register char * toname; + register char *fromname; + register char *toname; if (fromfile[0] == '/') fromname = ecpyalloc(fromfile); - else { + else + { fromname = ecpyalloc(directory); fromname = ecatalloc(fromname, "/"); fromname = ecatalloc(fromname, fromfile); } if (tofile[0] == '/') toname = ecpyalloc(tofile); - else { + else + { toname = ecpyalloc(directory); toname = ecatalloc(toname, "/"); toname = ecatalloc(toname, tofile); } + /* - ** We get to be careful here since - ** there's a fair chance of root running us. - */ + * * We get to be careful here since * there's a fair chance of root + * running us. + */ if (!itsdir(toname)) (void) remove(toname); - if (link(fromname, toname) != 0) { - int result; + if (link(fromname, toname) != 0) + { + int result; if (mkdirs(toname) != 0) (void) exit(EXIT_FAILURE); @@ -601,26 +631,29 @@ static void dolink(const char *fromfile, const char *tofile) result = link(fromname, toname); #ifdef HAVE_SYMLINK if (result != 0 && - access(fromname, F_OK) == 0 && - !itsdir(fromname)) { - const char *s = tofile; - register char * symlinkcontents = NULL; - while ((s = strchr(s+1, '/')) != NULL) - symlinkcontents = ecatalloc(symlinkcontents, "../"); + access(fromname, F_OK) == 0 && + !itsdir(fromname)) + { + const char *s = tofile; + register char *symlinkcontents = NULL; + + while ((s = strchr(s + 1, '/')) != NULL) + symlinkcontents = ecatalloc(symlinkcontents, "../"); symlinkcontents = ecatalloc(symlinkcontents, fromfile); result = symlink(symlinkcontents, toname); if (result == 0) -warning(_("hard link failed, symbolic link used")); + warning(_("hard link failed, symbolic link used")); ifree(symlinkcontents); } #endif - if (result != 0) { + if (result != 0) + { const char *e = strerror(errno); (void) fprintf(stderr, - _("%s: Can't link from %s to %s: %s\n"), - progname, fromname, toname, e); + _("%s: Can't link from %s to %s: %s\n"), + progname, fromname, toname, e); (void) exit(EXIT_FAILURE); } } @@ -629,12 +662,12 @@ warning(_("hard link failed, symbolic link used")); } #ifndef INT_MAX -#define INT_MAX ((int) (((unsigned)~0)>>1)) -#endif /* !defined INT_MAX */ +#define INT_MAX ((int) (((unsigned)~0)>>1)) +#endif /* !defined INT_MAX */ #ifndef INT_MIN -#define INT_MIN ((int) ~(((unsigned)~0)>>1)) -#endif /* !defined INT_MIN */ +#define INT_MIN ((int) ~(((unsigned)~0)>>1)) +#endif /* !defined INT_MIN */ /* ** The tz file format currently allows at most 32-bit quantities. @@ -644,17 +677,21 @@ warning(_("hard link failed, symbolic link used")); */ #define MAX_BITS_IN_FILE 32 -#define TIME_T_BITS_IN_FILE ((TYPE_BIT(time_t) < MAX_BITS_IN_FILE) ? TYPE_BIT(time_t) : MAX_BITS_IN_FILE) +#define TIME_T_BITS_IN_FILE ((TYPE_BIT(time_t) < MAX_BITS_IN_FILE) ? TYPE_BIT(time_t) : MAX_BITS_IN_FILE) -static void setboundaries(void) +static void +setboundaries(void) { - if (TYPE_SIGNED(time_t)) { - min_time = ~ (time_t) 0; + if (TYPE_SIGNED(time_t)) + { + min_time = ~(time_t) 0; min_time <<= TIME_T_BITS_IN_FILE - 1; - max_time = ~ (time_t) 0 - min_time; + max_time = ~(time_t) 0 - min_time; if (sflag) min_time = 0; - } else { + } + else + { min_time = 0; max_time = 2 - sflag; max_time <<= TIME_T_BITS_IN_FILE - 1; @@ -666,10 +703,11 @@ static void setboundaries(void) max_year_representable = max_year; } -static int itsdir(const char *name) +static int +itsdir(const char *name) { - register char * myname; - register int accres; + register char *myname; + register int accres; myname = ecpyalloc(name); myname = ecatalloc(myname, "/."); @@ -686,59 +724,69 @@ static int itsdir(const char *name) ** Sort by rule name. */ -static int rcomp(const void *cp1, const void *cp2) +static int +rcomp(const void *cp1, const void *cp2) { return strcmp(((const struct rule *) cp1)->r_name, - ((const struct rule *) cp2)->r_name); + ((const struct rule *) cp2)->r_name); } -static void associate(void) +static void +associate(void) { - register struct zone * zp; - register struct rule * rp; - register int base, out; - register int i, j; - - if (nrules != 0) { + register struct zone *zp; + register struct rule *rp; + register int base, + out; + register int i, + j; + + if (nrules != 0) + { (void) qsort((void *) rules, (size_t) nrules, - (size_t) sizeof *rules, rcomp); - for (i = 0; i < nrules - 1; ++i) { + (size_t) sizeof *rules, rcomp); + for (i = 0; i < nrules - 1; ++i) + { if (strcmp(rules[i].r_name, - rules[i + 1].r_name) != 0) - continue; + rules[i + 1].r_name) != 0) + continue; if (strcmp(rules[i].r_filename, - rules[i + 1].r_filename) == 0) - continue; + rules[i + 1].r_filename) == 0) + continue; eat(rules[i].r_filename, rules[i].r_linenum); warning(_("same rule name in multiple files")); eat(rules[i + 1].r_filename, rules[i + 1].r_linenum); warning(_("same rule name in multiple files")); - for (j = i + 2; j < nrules; ++j) { + for (j = i + 2; j < nrules; ++j) + { if (strcmp(rules[i].r_name, - rules[j].r_name) != 0) - break; + rules[j].r_name) != 0) + break; if (strcmp(rules[i].r_filename, - rules[j].r_filename) == 0) - continue; + rules[j].r_filename) == 0) + continue; if (strcmp(rules[i + 1].r_filename, - rules[j].r_filename) == 0) - continue; + rules[j].r_filename) == 0) + continue; break; } i = j - 1; } } - for (i = 0; i < nzones; ++i) { + for (i = 0; i < nzones; ++i) + { zp = &zones[i]; zp->z_rules = NULL; zp->z_nrules = 0; } - for (base = 0; base < nrules; base = out) { + for (base = 0; base < nrules; base = out) + { rp = &rules[base]; for (out = base + 1; out < nrules; ++out) if (strcmp(rp->r_name, rules[out].r_name) != 0) break; - for (i = 0; i < nzones; ++i) { + for (i = 0; i < nzones; ++i) + { zp = &zones[i]; if (strcmp(zp->z_rule, rp->r_name) != 0) continue; @@ -746,19 +794,22 @@ static void associate(void) zp->z_nrules = out - base; } } - for (i = 0; i < nzones; ++i) { + for (i = 0; i < nzones; ++i) + { zp = &zones[i]; - if (zp->z_nrules == 0) { + if (zp->z_nrules == 0) + { /* - ** Maybe we have a local standard time offset. - */ + * * Maybe we have a local standard time offset. + */ eat(zp->z_filename, zp->z_linenum); zp->z_stdoff = gethms(zp->z_rule, _("unruly zone"), - TRUE); + TRUE); + /* - ** Note, though, that if there's no rule, - ** a '%s' in the format is a bad thing. - */ + * * Note, though, that if there's no rule, * a '%s' in the + * format is a bad thing. + */ if (strchr(zp->z_format, '%') != 0) error(_("%s in ruleless zone")); } @@ -767,94 +818,109 @@ static void associate(void) (void) exit(EXIT_FAILURE); } -static void infile(const char *name) +static void +infile(const char *name) { - register FILE * fp; - register char ** fields; - register char * cp; - register const struct lookup * lp; - register int nfields; - register int wantcont; - register int num; - char buf[BUFSIZ]; - - if (strcmp(name, "-") == 0) { + register FILE *fp; + register char **fields; + register char *cp; + register const struct lookup *lp; + register int nfields; + register int wantcont; + register int num; + char buf[BUFSIZ]; + + if (strcmp(name, "-") == 0) + { name = _("standard input"); fp = stdin; - } else if ((fp = fopen(name, "r")) == NULL) { + } + else if ((fp = fopen(name, "r")) == NULL) + { const char *e = strerror(errno); (void) fprintf(stderr, _("%s: Can't open %s: %s\n"), - progname, name, e); + progname, name, e); (void) exit(EXIT_FAILURE); } wantcont = FALSE; - for (num = 1; ; ++num) { + for (num = 1;; ++num) + { eat(name, num); if (fgets(buf, (int) sizeof buf, fp) != buf) break; cp = strchr(buf, '\n'); - if (cp == NULL) { + if (cp == NULL) + { error(_("line too long")); (void) exit(EXIT_FAILURE); } *cp = '\0'; fields = getfields(buf); nfields = 0; - while (fields[nfields] != NULL) { - static char nada; + while (fields[nfields] != NULL) + { + static char nada; if (strcmp(fields[nfields], "-") == 0) fields[nfields] = &nada; ++nfields; } - if (nfields == 0) { + if (nfields == 0) + { /* nothing to do */ - } else if (wantcont) { + } + else if (wantcont) wantcont = inzcont(fields, nfields); - } else { + else + { lp = byword(fields[0], line_codes); if (lp == NULL) error(_("input line of unknown type")); - else switch ((int) (lp->l_value)) { - case LC_RULE: - inrule(fields, nfields); - wantcont = FALSE; - break; - case LC_ZONE: - wantcont = inzone(fields, nfields); - break; - case LC_LINK: - inlink(fields, nfields); - wantcont = FALSE; - break; - case LC_LEAP: - if (name != leapsec) + else + switch ((int) (lp->l_value)) + { + case LC_RULE: + inrule(fields, nfields); + wantcont = FALSE; + break; + case LC_ZONE: + wantcont = inzone(fields, nfields); + break; + case LC_LINK: + inlink(fields, nfields); + wantcont = FALSE; + break; + case LC_LEAP: + if (name != leapsec) + (void) fprintf(stderr, + _("%s: Leap line in non leap seconds file %s\n"), + progname, name); + else + inleap(fields, nfields); + wantcont = FALSE; + break; + default: /* "cannot happen" */ (void) fprintf(stderr, -_("%s: Leap line in non leap seconds file %s\n"), - progname, name); - else inleap(fields, nfields); - wantcont = FALSE; - break; - default: /* "cannot happen" */ - (void) fprintf(stderr, -_("%s: panic: Invalid l_value %d\n"), - progname, lp->l_value); - (void) exit(EXIT_FAILURE); - } + _("%s: panic: Invalid l_value %d\n"), + progname, lp->l_value); + (void) exit(EXIT_FAILURE); + } } ifree((char *) fields); } - if (ferror(fp)) { + if (ferror(fp)) + { (void) fprintf(stderr, _("%s: Error reading %s\n"), - progname, filename); + progname, filename); (void) exit(EXIT_FAILURE); } - if (fp != stdin && fclose(fp)) { + if (fp != stdin && fclose(fp)) + { const char *e = strerror(errno); (void) fprintf(stderr, _("%s: Error closing %s: %s\n"), - progname, filename, e); + progname, filename, e); (void) exit(EXIT_FAILURE); } if (wantcont) @@ -869,50 +935,62 @@ _("%s: panic: Invalid l_value %d\n"), ** Call error with errstring and return zero on errors. */ -static long gethms(const char *string, const char *errstring, const int signable) +static long +gethms(const char *string, const char *errstring, const int signable) { - int hh, mm, ss, sign; + int hh, + mm, + ss, + sign; if (string == NULL || *string == '\0') return 0; if (!signable) sign = 1; - else if (*string == '-') { + else if (*string == '-') + { sign = -1; ++string; - } else sign = 1; + } + else + sign = 1; if (sscanf(string, scheck(string, "%d"), &hh) == 1) mm = ss = 0; else if (sscanf(string, scheck(string, "%d:%d"), &hh, &mm) == 2) ss = 0; else if (sscanf(string, scheck(string, "%d:%d:%d"), - &hh, &mm, &ss) != 3) { - error(errstring); - return 0; + &hh, &mm, &ss) != 3) + { + error(errstring); + return 0; } if ((hh < 0 || hh >= HOURSPERDAY || - mm < 0 || mm >= MINSPERHOUR || - ss < 0 || ss > SECSPERMIN) && - !(hh == HOURSPERDAY && mm == 0 && ss == 0)) { - error(errstring); - return 0; + mm < 0 || mm >= MINSPERHOUR || + ss < 0 || ss > SECSPERMIN) && + !(hh == HOURSPERDAY && mm == 0 && ss == 0)) + { + error(errstring); + return 0; } if (noise && hh == HOURSPERDAY) warning(_("24:00 not handled by pre-1998 versions of zic")); return eitol(sign) * (eitol(hh * MINSPERHOUR + mm) * - eitol(SECSPERMIN) + eitol(ss)); + eitol(SECSPERMIN) + eitol(ss)); } -static void inrule(register char **fields, const int nfields) +static void +inrule(register char **fields, const int nfields) { - static struct rule r; + static struct rule r; - if (nfields != RULE_FIELDS) { + if (nfields != RULE_FIELDS) + { error(_("wrong number of fields on Rule line")); return; } - if (*fields[RF_NAME] == '\0') { + if (*fields[RF_NAME] == '\0') + { error(_("nameless rule")); return; } @@ -920,75 +998,88 @@ static void inrule(register char **fields, const int nfields) r.r_linenum = linenum; r.r_stdoff = gethms(fields[RF_STDOFF], _("invalid saved time"), TRUE); rulesub(&r, fields[RF_LOYEAR], fields[RF_HIYEAR], fields[RF_COMMAND], - fields[RF_MONTH], fields[RF_DAY], fields[RF_TOD]); + fields[RF_MONTH], fields[RF_DAY], fields[RF_TOD]); r.r_name = ecpyalloc(fields[RF_NAME]); r.r_abbrvar = ecpyalloc(fields[RF_ABBRVAR]); rules = (struct rule *) (void *) erealloc((char *) rules, - (int) ((nrules + 1) * sizeof *rules)); + (int) ((nrules + 1) * sizeof *rules)); rules[nrules++] = r; } -static int inzone(register char **fields, const int nfields) +static int +inzone(register char **fields, const int nfields) { - register int i; - static char * buf; + register int i; + static char *buf; - if (nfields < ZONE_MINFIELDS || nfields > ZONE_MAXFIELDS) { + if (nfields < ZONE_MINFIELDS || nfields > ZONE_MAXFIELDS) + { error(_("wrong number of fields on Zone line")); return FALSE; } - if (strcmp(fields[ZF_NAME], TZDEFAULT) == 0 && lcltime != NULL) { + if (strcmp(fields[ZF_NAME], TZDEFAULT) == 0 && lcltime != NULL) + { buf = erealloc(buf, (int) (132 + strlen(TZDEFAULT))); (void) sprintf(buf, -_("\"Zone %s\" line and -l option are mutually exclusive"), - TZDEFAULT); + _("\"Zone %s\" line and -l option are mutually exclusive"), + TZDEFAULT); error(buf); return FALSE; } - if (strcmp(fields[ZF_NAME], TZDEFRULES) == 0 && psxrules != NULL) { + if (strcmp(fields[ZF_NAME], TZDEFRULES) == 0 && psxrules != NULL) + { buf = erealloc(buf, (int) (132 + strlen(TZDEFRULES))); (void) sprintf(buf, -_("\"Zone %s\" line and -p option are mutually exclusive"), - TZDEFRULES); + _("\"Zone %s\" line and -p option are mutually exclusive"), + TZDEFRULES); error(buf); return FALSE; } for (i = 0; i < nzones; ++i) if (zones[i].z_name != NULL && - strcmp(zones[i].z_name, fields[ZF_NAME]) == 0) { - buf = erealloc(buf, (int) (132 + - strlen(fields[ZF_NAME]) + - strlen(zones[i].z_filename))); - (void) sprintf(buf, -_("duplicate zone name %s (file \"%s\", line %d)"), - fields[ZF_NAME], - zones[i].z_filename, - zones[i].z_linenum); - error(buf); - return FALSE; + strcmp(zones[i].z_name, fields[ZF_NAME]) == 0) + { + buf = erealloc(buf, (int) (132 + + strlen(fields[ZF_NAME]) + + strlen(zones[i].z_filename))); + (void) sprintf(buf, + _("duplicate zone name %s (file \"%s\", line %d)"), + fields[ZF_NAME], + zones[i].z_filename, + zones[i].z_linenum); + error(buf); + return FALSE; } return inzsub(fields, nfields, FALSE); } -static int inzcont(register char **fields, const int nfields) +static int +inzcont(register char **fields, const int nfields) { - if (nfields < ZONEC_MINFIELDS || nfields > ZONEC_MAXFIELDS) { + if (nfields < ZONEC_MINFIELDS || nfields > ZONEC_MAXFIELDS) + { error(_("wrong number of fields on Zone continuation line")); return FALSE; } return inzsub(fields, nfields, TRUE); } -static int inzsub(register char **fields, const int nfields, const int iscont) +static int +inzsub(register char **fields, const int nfields, const int iscont) { - register char * cp; - static struct zone z; - register int i_gmtoff, i_rule, i_format; - register int i_untilyear, i_untilmonth; - register int i_untilday, i_untiltime; - register int hasuntil; - - if (iscont) { + register char *cp; + static struct zone z; + register int i_gmtoff, + i_rule, + i_format; + register int i_untilyear, + i_untilmonth; + register int i_untilday, + i_untiltime; + register int hasuntil; + + if (iscont) + { i_gmtoff = ZFC_GMTOFF; i_rule = ZFC_RULE; i_format = ZFC_FORMAT; @@ -997,7 +1088,9 @@ static int inzsub(register char **fields, const int nfields, const int iscont) i_untilday = ZFC_TILDAY; i_untiltime = ZFC_TILTIME; z.z_name = NULL; - } else { + } + else + { i_gmtoff = ZF_GMTOFF; i_rule = ZF_RULE; i_format = ZF_FORMAT; @@ -1010,8 +1103,10 @@ static int inzsub(register char **fields, const int nfields, const int iscont) z.z_filename = filename; z.z_linenum = linenum; z.z_gmtoff = gethms(fields[i_gmtoff], _("invalid UTC offset"), TRUE); - if ((cp = strchr(fields[i_format], '%')) != 0) { - if (*++cp != 's' || strchr(cp, '%') != 0) { + if ((cp = strchr(fields[i_format], '%')) != 0) + { + if (*++cp != 's' || strchr(cp, '%') != 0) + { error(_("invalid abbreviation format")); return FALSE; } @@ -1019,126 +1114,157 @@ static int inzsub(register char **fields, const int nfields, const int iscont) z.z_rule = ecpyalloc(fields[i_rule]); z.z_format = ecpyalloc(fields[i_format]); hasuntil = nfields > i_untilyear; - if (hasuntil) { + if (hasuntil) + { z.z_untilrule.r_filename = filename; z.z_untilrule.r_linenum = linenum; rulesub(&z.z_untilrule, - fields[i_untilyear], - "only", - "", - (nfields > i_untilmonth) ? - fields[i_untilmonth] : "Jan", - (nfields > i_untilday) ? fields[i_untilday] : "1", - (nfields > i_untiltime) ? fields[i_untiltime] : "0"); + fields[i_untilyear], + "only", + "", + (nfields > i_untilmonth) ? + fields[i_untilmonth] : "Jan", + (nfields > i_untilday) ? fields[i_untilday] : "1", + (nfields > i_untiltime) ? fields[i_untiltime] : "0"); z.z_untiltime = rpytime(&z.z_untilrule, - z.z_untilrule.r_loyear); + z.z_untilrule.r_loyear); if (iscont && nzones > 0 && z.z_untiltime > min_time && z.z_untiltime < max_time && zones[nzones - 1].z_untiltime > min_time && zones[nzones - 1].z_untiltime < max_time && - zones[nzones - 1].z_untiltime >= z.z_untiltime) { - error(_("Zone continuation line end time is not after end time of previous line")); - return FALSE; + zones[nzones - 1].z_untiltime >= z.z_untiltime) + { + error(_("Zone continuation line end time is not after end time of previous line")); + return FALSE; } } zones = (struct zone *) (void *) erealloc((char *) zones, - (int) ((nzones + 1) * sizeof *zones)); + (int) ((nzones + 1) * sizeof *zones)); zones[nzones++] = z; + /* - ** If there was an UNTIL field on this line, - ** there's more information about the zone on the next line. - */ + * * If there was an UNTIL field on this line, * there's more + * information about the zone on the next line. + */ return hasuntil; } -static void inleap(register char **fields, const int nfields) +static void +inleap(register char **fields, const int nfields) { - register const char * cp; - register const struct lookup * lp; - register int i, j; - int year, month, day; - long dayoff, tod; - time_t t; - - if (nfields != LEAP_FIELDS) { + register const char *cp; + register const struct lookup *lp; + register int i, + j; + int year, + month, + day; + long dayoff, + tod; + time_t t; + + if (nfields != LEAP_FIELDS) + { error(_("wrong number of fields on Leap line")); return; } dayoff = 0; cp = fields[LP_YEAR]; - if (sscanf(cp, scheck(cp, "%d"), &year) != 1) { - /* - * Leapin' Lizards! - */ - error(_("invalid leaping year")); - return; + if (sscanf(cp, scheck(cp, "%d"), &year) != 1) + { + /* + * Leapin' Lizards! + */ + error(_("invalid leaping year")); + return; } j = EPOCH_YEAR; - while (j != year) { - if (year > j) { + while (j != year) + { + if (year > j) + { i = len_years[isleap(j)]; ++j; - } else { + } + else + { --j; i = -len_years[isleap(j)]; } dayoff = oadd(dayoff, eitol(i)); } - if ((lp = byword(fields[LP_MONTH], mon_names)) == NULL) { + if ((lp = byword(fields[LP_MONTH], mon_names)) == NULL) + { error(_("invalid month name")); return; } month = lp->l_value; j = TM_JANUARY; - while (j != month) { + while (j != month) + { i = len_months[isleap(year)][j]; dayoff = oadd(dayoff, eitol(i)); ++j; } cp = fields[LP_DAY]; if (sscanf(cp, scheck(cp, "%d"), &day) != 1 || - day <= 0 || day > len_months[isleap(year)][month]) { - error(_("invalid day of month")); - return; + day <= 0 || day > len_months[isleap(year)][month]) + { + error(_("invalid day of month")); + return; } dayoff = oadd(dayoff, eitol(day - 1)); - if (dayoff < 0 && !TYPE_SIGNED(time_t)) { + if (dayoff < 0 && !TYPE_SIGNED(time_t)) + { error(_("time before zero")); return; } - if (dayoff < min_time / SECSPERDAY) { + if (dayoff < min_time / SECSPERDAY) + { error(_("time too small")); return; } - if (dayoff > max_time / SECSPERDAY) { + if (dayoff > max_time / SECSPERDAY) + { error(_("time too large")); return; } - t = (time_t) dayoff * SECSPERDAY; + t = (time_t) dayoff *SECSPERDAY; + tod = gethms(fields[LP_TIME], _("invalid time of day"), FALSE); cp = fields[LP_CORR]; { - register int positive; - int count; + register int positive; + int count; - if (strcmp(cp, "") == 0) { /* infile() turns "-" into "" */ + if (strcmp(cp, "") == 0) + { /* infile() turns "-" into "" */ positive = FALSE; count = 1; - } else if (strcmp(cp, "--") == 0) { + } + else if (strcmp(cp, "--") == 0) + { positive = FALSE; count = 2; - } else if (strcmp(cp, "+") == 0) { + } + else if (strcmp(cp, "+") == 0) + { positive = TRUE; count = 1; - } else if (strcmp(cp, "++") == 0) { + } + else if (strcmp(cp, "++") == 0) + { positive = TRUE; count = 2; - } else { + } + else + { error(_("illegal CORRECTION field on Leap line")); return; } - if ((lp = byword(fields[LP_ROLL], leap_types)) == NULL) { + if ((lp = byword(fields[LP_ROLL], leap_types)) == NULL) + { error(_("illegal Rolling/Stationary field on Leap line")); return; } @@ -1146,19 +1272,23 @@ static void inleap(register char **fields, const int nfields) } } -static void inlink(register char **fields, const int nfields) +static void +inlink(register char **fields, const int nfields) { - struct link l; + struct link l; - if (nfields != LINK_FIELDS) { + if (nfields != LINK_FIELDS) + { error(_("wrong number of fields on Link line")); return; } - if (*fields[LF_FROM] == '\0') { + if (*fields[LF_FROM] == '\0') + { error(_("blank FROM field on Link line")); return; } - if (*fields[LF_TO] == '\0') { + if (*fields[LF_TO] == '\0') + { error(_("blank TO field on Link line")); return; } @@ -1167,18 +1297,20 @@ static void inlink(register char **fields, const int nfields) l.l_from = ecpyalloc(fields[LF_FROM]); l.l_to = ecpyalloc(fields[LF_TO]); links = (struct link *) (void *) erealloc((char *) links, - (int) ((nlinks + 1) * sizeof *links)); + (int) ((nlinks + 1) * sizeof *links)); links[nlinks++] = l; } -static void rulesub(register struct rule *rp, const char *loyearp, const char *hiyearp, const char *typep, const char *monthp, const char *dayp, const char *timep) +static void +rulesub(register struct rule * rp, const char *loyearp, const char *hiyearp, const char *typep, const char *monthp, const char *dayp, const char *timep) { - register const struct lookup * lp; - register const char * cp; - register char * dp; - register char * ep; + register const struct lookup *lp; + register const char *cp; + register char *dp; + register char *ep; - if ((lp = byword(monthp, mon_names)) == NULL) { + if ((lp = byword(monthp, mon_names)) == NULL) + { error(_("invalid month name")); return; } @@ -1186,22 +1318,24 @@ static void rulesub(register struct rule *rp, const char *loyearp, const char *h rp->r_todisstd = FALSE; rp->r_todisgmt = FALSE; dp = ecpyalloc(timep); - if (*dp != '\0') { + if (*dp != '\0') + { ep = dp + strlen(dp) - 1; - switch (lowerit(*ep)) { - case 's': /* Standard */ + switch (lowerit(*ep)) + { + case 's': /* Standard */ rp->r_todisstd = TRUE; rp->r_todisgmt = FALSE; *ep = '\0'; break; - case 'w': /* Wall */ + case 'w': /* Wall */ rp->r_todisstd = FALSE; rp->r_todisgmt = FALSE; *ep = '\0'; break; - case 'g': /* Greenwich */ - case 'u': /* Universal */ - case 'z': /* Zulu */ + case 'g': /* Greenwich */ + case 'u': /* Universal */ + case 'z': /* Zulu */ rp->r_todisstd = TRUE; rp->r_todisgmt = TRUE; *ep = '\0'; @@ -1210,65 +1344,81 @@ static void rulesub(register struct rule *rp, const char *loyearp, const char *h } rp->r_tod = gethms(dp, _("invalid time of day"), FALSE); ifree(dp); + /* - ** Year work. - */ + * * Year work. + */ cp = loyearp; lp = byword(cp, begin_years); - if (lp != NULL) switch ((int) lp->l_value) { - case YR_MINIMUM: - rp->r_loyear = INT_MIN; - break; - case YR_MAXIMUM: - rp->r_loyear = INT_MAX; - break; - default: /* "cannot happen" */ - (void) fprintf(stderr, - _("%s: panic: Invalid l_value %d\n"), - progname, lp->l_value); - (void) exit(EXIT_FAILURE); - } else if (sscanf(cp, scheck(cp, "%d"), &rp->r_loyear) != 1) { + if (lp != NULL) + switch ((int) lp->l_value) + { + case YR_MINIMUM: + rp->r_loyear = INT_MIN; + break; + case YR_MAXIMUM: + rp->r_loyear = INT_MAX; + break; + default: /* "cannot happen" */ + (void) fprintf(stderr, + _("%s: panic: Invalid l_value %d\n"), + progname, lp->l_value); + (void) exit(EXIT_FAILURE); + } + else if (sscanf(cp, scheck(cp, "%d"), &rp->r_loyear) != 1) + { error(_("invalid starting year")); return; - } else if (noise) { + } + else if (noise) + { if (rp->r_loyear < min_year_representable) warning(_("starting year too low to be represented")); else if (rp->r_loyear > max_year_representable) warning(_("starting year too high to be represented")); } cp = hiyearp; - if ((lp = byword(cp, end_years)) != NULL) switch ((int) lp->l_value) { - case YR_MINIMUM: - rp->r_hiyear = INT_MIN; - break; - case YR_MAXIMUM: - rp->r_hiyear = INT_MAX; - break; - case YR_ONLY: - rp->r_hiyear = rp->r_loyear; - break; - default: /* "cannot happen" */ - (void) fprintf(stderr, - _("%s: panic: Invalid l_value %d\n"), - progname, lp->l_value); - (void) exit(EXIT_FAILURE); - } else if (sscanf(cp, scheck(cp, "%d"), &rp->r_hiyear) != 1) { + if ((lp = byword(cp, end_years)) != NULL) + switch ((int) lp->l_value) + { + case YR_MINIMUM: + rp->r_hiyear = INT_MIN; + break; + case YR_MAXIMUM: + rp->r_hiyear = INT_MAX; + break; + case YR_ONLY: + rp->r_hiyear = rp->r_loyear; + break; + default: /* "cannot happen" */ + (void) fprintf(stderr, + _("%s: panic: Invalid l_value %d\n"), + progname, lp->l_value); + (void) exit(EXIT_FAILURE); + } + else if (sscanf(cp, scheck(cp, "%d"), &rp->r_hiyear) != 1) + { error(_("invalid ending year")); return; - } else if (noise) { + } + else if (noise) + { if (rp->r_loyear < min_year_representable) warning(_("ending year too low to be represented")); else if (rp->r_loyear > max_year_representable) warning(_("ending year too high to be represented")); } - if (rp->r_loyear > rp->r_hiyear) { + if (rp->r_loyear > rp->r_hiyear) + { error(_("starting year greater than ending year")); return; } if (*typep == '\0') rp->r_yrtype = NULL; - else { - if (rp->r_loyear == rp->r_hiyear) { + else + { + if (rp->r_loyear == rp->r_hiyear) + { error(_("typed single year")); return; } @@ -1276,36 +1426,40 @@ static void rulesub(register struct rule *rp, const char *loyearp, const char *h } if (rp->r_loyear < min_year && rp->r_loyear > 0) min_year = rp->r_loyear; + /* - ** Day work. - ** Accept things such as: - ** 1 - ** last-Sunday - ** Sun<=20 - ** Sun>=7 - */ + * * Day work. * Accept things such as: * 1 * last-Sunday * Sun<=20 * + * Sun>=7 + */ dp = ecpyalloc(dayp); - if ((lp = byword(dp, lasts)) != NULL) { + if ((lp = byword(dp, lasts)) != NULL) + { rp->r_dycode = DC_DOWLEQ; rp->r_wday = lp->l_value; rp->r_dayofmonth = len_months[1][rp->r_month]; - } else { + } + else + { if ((ep = strchr(dp, '<')) != 0) rp->r_dycode = DC_DOWLEQ; else if ((ep = strchr(dp, '>')) != 0) rp->r_dycode = DC_DOWGEQ; - else { + else + { ep = dp; rp->r_dycode = DC_DOM; } - if (rp->r_dycode != DC_DOM) { + if (rp->r_dycode != DC_DOM) + { *ep++ = 0; - if (*ep++ != '=') { + if (*ep++ != '=') + { error(_("invalid day of month")); ifree(dp); return; } - if ((lp = byword(dp, wday_names)) == NULL) { + if ((lp = byword(dp, wday_names)) == NULL) + { error(_("invalid weekday name")); ifree(dp); return; @@ -1314,62 +1468,70 @@ static void rulesub(register struct rule *rp, const char *loyearp, const char *h } if (sscanf(ep, scheck(ep, "%d"), &rp->r_dayofmonth) != 1 || rp->r_dayofmonth <= 0 || - (rp->r_dayofmonth > len_months[1][rp->r_month])) { - error(_("invalid day of month")); - ifree(dp); - return; + (rp->r_dayofmonth > len_months[1][rp->r_month])) + { + error(_("invalid day of month")); + ifree(dp); + return; } } ifree(dp); } -static void convert(const long val, char *buf) +static void +convert(const long val, char *buf) { - register int i; - register long shift; + register int i; + register long shift; for (i = 0, shift = 24; i < 4; ++i, shift -= 8) buf[i] = val >> shift; } -static void puttzcode(const long val, FILE *fp) +static void +puttzcode(const long val, FILE *fp) { - char buf[4]; + char buf[4]; convert(val, buf); (void) fwrite((void *) buf, (size_t) sizeof buf, (size_t) 1, fp); } -static int atcomp(const void *avp,const void *bvp) +static int +atcomp(const void *avp, const void *bvp) { if (((struct attype *) avp)->at < ((struct attype *) bvp)->at) return -1; else if (((struct attype *) avp)->at > ((struct attype *) bvp)->at) return 1; - else return 0; + else + return 0; } -static void writezone(const char *name) +static void +writezone(const char *name) { - register FILE * fp; - register int i, j; - static char * fullname; - static struct tzhead tzh; - time_t ats[TZ_MAX_TIMES]; - unsigned char types[TZ_MAX_TIMES]; + register FILE *fp; + register int i, + j; + static char *fullname; + static struct tzhead tzh; + time_t ats[TZ_MAX_TIMES]; + unsigned char types[TZ_MAX_TIMES]; /* - ** Sort. - */ + * * Sort. + */ if (timecnt > 1) (void) qsort((void *) attypes, (size_t) timecnt, - (size_t) sizeof *attypes, atcomp); + (size_t) sizeof *attypes, atcomp); + /* - ** Optimize. - */ + * * Optimize. + */ { - int fromi; - int toi; + int fromi; + int toi; toi = 0; fromi = 0; @@ -1377,51 +1539,59 @@ static void writezone(const char *name) ++fromi; if (isdsts[0] == 0) while (fromi < timecnt && attypes[fromi].type == 0) - ++fromi; /* handled by default rule */ - for ( ; fromi < timecnt; ++fromi) { + ++fromi; /* handled by default rule */ + for (; fromi < timecnt; ++fromi) + { if (toi != 0 - && ((attypes[fromi].at - + gmtoffs[attypes[toi - 1].type]) - <= (attypes[toi - 1].at - + gmtoffs[toi == 1 ? 0 - : attypes[toi - 2].type]))) { + && ((attypes[fromi].at + + gmtoffs[attypes[toi - 1].type]) + <= (attypes[toi - 1].at + + gmtoffs[toi == 1 ? 0 + : attypes[toi - 2].type]))) + { attypes[toi - 1].type = attypes[fromi].type; continue; } if (toi == 0 || attypes[toi - 1].type != attypes[fromi].type) - attypes[toi++] = attypes[fromi]; + attypes[toi++] = attypes[fromi]; } timecnt = toi; } + /* - ** Transfer. - */ - for (i = 0; i < timecnt; ++i) { + * * Transfer. + */ + for (i = 0; i < timecnt; ++i) + { ats[i] = attypes[i].at; types[i] = attypes[i].type; } fullname = erealloc(fullname, - (int) (strlen(directory) + 1 + strlen(name) + 1)); + (int) (strlen(directory) + 1 + strlen(name) + 1)); (void) sprintf(fullname, "%s/%s", directory, name); + /* - ** Remove old file, if any, to snap links. - */ - if (!itsdir(fullname) && remove(fullname) != 0 && errno != ENOENT) { + * * Remove old file, if any, to snap links. + */ + if (!itsdir(fullname) && remove(fullname) != 0 && errno != ENOENT) + { const char *e = strerror(errno); (void) fprintf(stderr, _("%s: Can't remove %s: %s\n"), - progname, fullname, e); + progname, fullname, e); (void) exit(EXIT_FAILURE); } - if ((fp = fopen(fullname, "wb")) == NULL) { + if ((fp = fopen(fullname, "wb")) == NULL) + { if (mkdirs(fullname) != 0) (void) exit(EXIT_FAILURE); - if ((fp = fopen(fullname, "wb")) == NULL) { + if ((fp = fopen(fullname, "wb")) == NULL) + { const char *e = strerror(errno); (void) fprintf(stderr, _("%s: Can't create %s: %s\n"), - progname, fullname, e); + progname, fullname, e); (void) exit(EXIT_FAILURE); } } @@ -1442,10 +1612,12 @@ static void writezone(const char *name) DO(tzh_typecnt); DO(tzh_charcnt); #undef DO - for (i = 0; i < timecnt; ++i) { + for (i = 0; i < timecnt; ++i) + { j = leapcnt; while (--j >= 0) - if (ats[i] >= trans[j]) { + if (ats[i] >= trans[j]) + { ats[i] = tadd(ats[i], corr[j]); break; } @@ -1453,92 +1625,112 @@ static void writezone(const char *name) } if (timecnt > 0) (void) fwrite((void *) types, (size_t) sizeof types[0], - (size_t) timecnt, fp); - for (i = 0; i < typecnt; ++i) { + (size_t) timecnt, fp); + for (i = 0; i < typecnt; ++i) + { puttzcode((long) gmtoffs[i], fp); (void) putc(isdsts[i], fp); (void) putc(abbrinds[i], fp); } if (charcnt != 0) (void) fwrite((void *) chars, (size_t) sizeof chars[0], - (size_t) charcnt, fp); - for (i = 0; i < leapcnt; ++i) { - if (roll[i]) { - if (timecnt == 0 || trans[i] < ats[0]) { + (size_t) charcnt, fp); + for (i = 0; i < leapcnt; ++i) + { + if (roll[i]) + { + if (timecnt == 0 || trans[i] < ats[0]) + { j = 0; while (isdsts[j]) - if (++j >= typecnt) { + if (++j >= typecnt) + { j = 0; break; } - } else { + } + else + { j = 1; while (j < timecnt && trans[i] >= ats[j]) ++j; j = types[j - 1]; } puttzcode((long) tadd(trans[i], -gmtoffs[j]), fp); - } else puttzcode((long) trans[i], fp); + } + else + puttzcode((long) trans[i], fp); puttzcode((long) corr[i], fp); } for (i = 0; i < typecnt; ++i) (void) putc(ttisstds[i], fp); for (i = 0; i < typecnt; ++i) (void) putc(ttisgmts[i], fp); - if (ferror(fp) || fclose(fp)) { + if (ferror(fp) || fclose(fp)) + { (void) fprintf(stderr, _("%s: Error writing %s\n"), - progname, fullname); + progname, fullname); (void) exit(EXIT_FAILURE); } } -static void doabbr(char *abbr, const char *format, const char *letters, const int isdst) +static void +doabbr(char *abbr, const char *format, const char *letters, const int isdst) { - if (strchr(format, '/') == NULL) { + if (strchr(format, '/') == NULL) + { if (letters == NULL) (void) strcpy(abbr, format); - else (void) sprintf(abbr, format, letters); - } else if (isdst) + else + (void) sprintf(abbr, format, letters); + } + else if (isdst) (void) strcpy(abbr, strchr(format, '/') + 1); - else { + else + { (void) strcpy(abbr, format); *strchr(abbr, '/') = '\0'; } } -static void outzone(const struct zone *zpfirst, const int zonecount) +static void +outzone(const struct zone * zpfirst, const int zonecount) { - register const struct zone * zp; - register struct rule * rp; - register int i, j; - register int usestart, useuntil; - register time_t starttime = 0; - register time_t untiltime = 0; - register long gmtoff; - register long stdoff; - register int year; - register long startoff; - register int startttisstd; - register int startttisgmt; - register int type; - char startbuf[BUFSIZ]; + register const struct zone *zp; + register struct rule *rp; + register int i, + j; + register int usestart, + useuntil; + register time_t starttime = 0; + register time_t untiltime = 0; + register long gmtoff; + register long stdoff; + register int year; + register long startoff; + register int startttisstd; + register int startttisgmt; + register int type; + char startbuf[BUFSIZ]; /* - ** Now. . .finally. . .generate some useful data! - */ + * * Now. . .finally. . .generate some useful data! + */ timecnt = 0; typecnt = 0; charcnt = 0; + /* - ** Thanks to Earl Chew (earl@dnd.icp.nec.com.au) - ** for noting the need to unconditionally initialize startttisstd. - */ + * * Thanks to Earl Chew (earl@dnd.icp.nec.com.au) * for noting the + * need to unconditionally initialize startttisstd. + */ startttisstd = FALSE; startttisgmt = FALSE; - for (i = 0; i < zonecount; ++i) { + for (i = 0; i < zonecount; ++i) + { /* - ** A guess that may well be corrected later. - */ + * * A guess that may well be corrected later. + */ stdoff = 0; zp = &zpfirst[i]; usestart = i > 0 && (zp - 1)->z_untiltime > min_time; @@ -1549,134 +1741,154 @@ static void outzone(const struct zone *zpfirst, const int zonecount) eat(zp->z_filename, zp->z_linenum); *startbuf = '\0'; startoff = zp->z_gmtoff; - if (zp->z_nrules == 0) { + if (zp->z_nrules == 0) + { stdoff = zp->z_stdoff; doabbr(startbuf, zp->z_format, - (char *) NULL, stdoff != 0); + (char *) NULL, stdoff != 0); type = addtype(oadd(zp->z_gmtoff, stdoff), - startbuf, stdoff != 0, startttisstd, - startttisgmt); - if (usestart) { + startbuf, stdoff != 0, startttisstd, + startttisgmt); + if (usestart) + { addtt(starttime, type); usestart = FALSE; - } else if (stdoff != 0) - addtt(min_time, type); - } else for (year = min_year; year <= max_year; ++year) { - if (useuntil && year > zp->z_untilrule.r_hiyear) - break; - /* - ** Mark which rules to do in the current year. - ** For those to do, calculate rpytime(rp, year); - */ - for (j = 0; j < zp->z_nrules; ++j) { - rp = &zp->z_rules[j]; - eats(zp->z_filename, zp->z_linenum, - rp->r_filename, rp->r_linenum); - rp->r_todo = year >= rp->r_loyear && - year <= rp->r_hiyear && - yearistype(year, rp->r_yrtype); - if (rp->r_todo) - rp->r_temp = rpytime(rp, year); } - for ( ; ; ) { - register int k; - register time_t jtime, ktime = 0; - register long offset; - char buf[BUFSIZ]; + else if (stdoff != 0) + addtt(min_time, type); + } + else + for (year = min_year; year <= max_year; ++year) + { + if (useuntil && year > zp->z_untilrule.r_hiyear) + break; - if (useuntil) { - /* - ** Turn untiltime into UTC - ** assuming the current gmtoff and - ** stdoff values. - */ - untiltime = zp->z_untiltime; - if (!zp->z_untilrule.r_todisgmt) - untiltime = tadd(untiltime, - -gmtoff); - if (!zp->z_untilrule.r_todisstd) - untiltime = tadd(untiltime, - -stdoff); - } /* - ** Find the rule (of those to do, if any) - ** that takes effect earliest in the year. - */ - k = -1; - for (j = 0; j < zp->z_nrules; ++j) { + * * Mark which rules to do in the current year. * For + * those to do, calculate rpytime(rp, year); + */ + for (j = 0; j < zp->z_nrules; ++j) + { rp = &zp->z_rules[j]; - if (!rp->r_todo) - continue; eats(zp->z_filename, zp->z_linenum, - rp->r_filename, rp->r_linenum); - offset = rp->r_todisgmt ? 0 : gmtoff; - if (!rp->r_todisstd) - offset = oadd(offset, stdoff); - jtime = rp->r_temp; - if (jtime == min_time || - jtime == max_time) - continue; - jtime = tadd(jtime, -offset); - if (k < 0 || jtime < ktime) { - k = j; - ktime = jtime; - } + rp->r_filename, rp->r_linenum); + rp->r_todo = year >= rp->r_loyear && + year <= rp->r_hiyear && + yearistype(year, rp->r_yrtype); + if (rp->r_todo) + rp->r_temp = rpytime(rp, year); } - if (k < 0) - break; /* go on to next year */ - rp = &zp->z_rules[k]; - rp->r_todo = FALSE; - if (useuntil && ktime >= untiltime) - break; - stdoff = rp->r_stdoff; - if (usestart && ktime == starttime) - usestart = FALSE; - if (usestart) { - if (ktime < starttime) { - startoff = oadd(zp->z_gmtoff, - stdoff); - doabbr(startbuf, zp->z_format, - rp->r_abbrvar, - rp->r_stdoff != 0); - continue; + for (;;) + { + register int k; + register time_t jtime, + ktime = 0; + register long offset; + char buf[BUFSIZ]; + + if (useuntil) + { + /* + * * Turn untiltime into UTC * assuming the + * current gmtoff and * stdoff values. + */ + untiltime = zp->z_untiltime; + if (!zp->z_untilrule.r_todisgmt) + untiltime = tadd(untiltime, + -gmtoff); + if (!zp->z_untilrule.r_todisstd) + untiltime = tadd(untiltime, + -stdoff); } - if (*startbuf == '\0' && - startoff == oadd(zp->z_gmtoff, - stdoff)) { - doabbr(startbuf, zp->z_format, - rp->r_abbrvar, - rp->r_stdoff != 0); + + /* + * * Find the rule (of those to do, if any) * that + * takes effect earliest in the year. + */ + k = -1; + for (j = 0; j < zp->z_nrules; ++j) + { + rp = &zp->z_rules[j]; + if (!rp->r_todo) + continue; + eats(zp->z_filename, zp->z_linenum, + rp->r_filename, rp->r_linenum); + offset = rp->r_todisgmt ? 0 : gmtoff; + if (!rp->r_todisstd) + offset = oadd(offset, stdoff); + jtime = rp->r_temp; + if (jtime == min_time || + jtime == max_time) + continue; + jtime = tadd(jtime, -offset); + if (k < 0 || jtime < ktime) + { + k = j; + ktime = jtime; + } + } + if (k < 0) + break; /* go on to next year */ + rp = &zp->z_rules[k]; + rp->r_todo = FALSE; + if (useuntil && ktime >= untiltime) + break; + stdoff = rp->r_stdoff; + if (usestart && ktime == starttime) + usestart = FALSE; + if (usestart) + { + if (ktime < starttime) + { + startoff = oadd(zp->z_gmtoff, + stdoff); + doabbr(startbuf, zp->z_format, + rp->r_abbrvar, + rp->r_stdoff != 0); + continue; + } + if (*startbuf == '\0' && + startoff == oadd(zp->z_gmtoff, + stdoff)) + { + doabbr(startbuf, zp->z_format, + rp->r_abbrvar, + rp->r_stdoff != 0); + } } + eats(zp->z_filename, zp->z_linenum, + rp->r_filename, rp->r_linenum); + doabbr(buf, zp->z_format, rp->r_abbrvar, + rp->r_stdoff != 0); + offset = oadd(zp->z_gmtoff, rp->r_stdoff); + type = addtype(offset, buf, rp->r_stdoff != 0, + rp->r_todisstd, rp->r_todisgmt); + addtt(ktime, type); } - eats(zp->z_filename, zp->z_linenum, - rp->r_filename, rp->r_linenum); - doabbr(buf, zp->z_format, rp->r_abbrvar, - rp->r_stdoff != 0); - offset = oadd(zp->z_gmtoff, rp->r_stdoff); - type = addtype(offset, buf, rp->r_stdoff != 0, - rp->r_todisstd, rp->r_todisgmt); - addtt(ktime, type); } - } - if (usestart) { + if (usestart) + { if (*startbuf == '\0' && zp->z_format != NULL && strchr(zp->z_format, '%') == NULL && strchr(zp->z_format, '/') == NULL) - (void) strcpy(startbuf, zp->z_format); + (void) strcpy(startbuf, zp->z_format); eat(zp->z_filename, zp->z_linenum); if (*startbuf == '\0') -error(_("can't determine time zone abbreviation to use just after until time")); - else addtt(starttime, - addtype(startoff, startbuf, - startoff != zp->z_gmtoff, - startttisstd, - startttisgmt)); + error(_("can't determine time zone abbreviation to use just after until time")); + else + addtt(starttime, + addtype(startoff, startbuf, + startoff != zp->z_gmtoff, + startttisstd, + startttisgmt)); } + /* - ** Now we may get to set starttime for the next zone line. - */ - if (useuntil) { + * * Now we may get to set starttime for the next zone line. + */ + if (useuntil) + { startttisstd = zp->z_untilrule.r_todisstd; startttisgmt = zp->z_untilrule.r_todisgmt; starttime = zp->z_untiltime; @@ -1689,10 +1901,12 @@ error(_("can't determine time zone abbreviation to use just after until time")); writezone(zpfirst->z_name); } -static void addtt(const time_t starttime, int type) +static void +addtt(const time_t starttime, int type) { if (starttime <= min_time || - (timecnt == 1 && attypes[0].at < min_time)) { + (timecnt == 1 && attypes[0].at < min_time)) + { gmtoffs[0] = gmtoffs[type]; isdsts[0] = isdsts[type]; ttisstds[0] = ttisstds[type]; @@ -1705,7 +1919,8 @@ static void addtt(const time_t starttime, int type) timecnt = 0; type = 0; } - if (timecnt >= TZ_MAX_TIMES) { + if (timecnt >= TZ_MAX_TIMES) + { error(_("too many transitions?!")); (void) exit(EXIT_FAILURE); } @@ -1714,38 +1929,47 @@ static void addtt(const time_t starttime, int type) ++timecnt; } -static int addtype(const long gmtoff, const char *abbr, const int isdst, const int ttisstd, const int ttisgmt) +static int +addtype(const long gmtoff, const char *abbr, const int isdst, const int ttisstd, const int ttisgmt) { - register int i, j; + register int i, + j; - if (isdst != TRUE && isdst != FALSE) { + if (isdst != TRUE && isdst != FALSE) + { error(_("internal error - addtype called with bad isdst")); (void) exit(EXIT_FAILURE); } - if (ttisstd != TRUE && ttisstd != FALSE) { + if (ttisstd != TRUE && ttisstd != FALSE) + { error(_("internal error - addtype called with bad ttisstd")); (void) exit(EXIT_FAILURE); } - if (ttisgmt != TRUE && ttisgmt != FALSE) { + if (ttisgmt != TRUE && ttisgmt != FALSE) + { error(_("internal error - addtype called with bad ttisgmt")); (void) exit(EXIT_FAILURE); } + /* - ** See if there's already an entry for this zone type. - ** If so, just return its index. - */ - for (i = 0; i < typecnt; ++i) { + * * See if there's already an entry for this zone type. * If so, just + * return its index. + */ + for (i = 0; i < typecnt; ++i) + { if (gmtoff == gmtoffs[i] && isdst == isdsts[i] && strcmp(abbr, &chars[abbrinds[i]]) == 0 && ttisstd == ttisstds[i] && ttisgmt == ttisgmts[i]) - return i; + return i; } + /* - ** There isn't one; add a new one, unless there are already too - ** many. - */ - if (typecnt >= TZ_MAX_TYPES) { + * * There isn't one; add a new one, unless there are already too * + * many. + */ + if (typecnt >= TZ_MAX_TYPES) + { error(_("too many local time types")); (void) exit(EXIT_FAILURE); } @@ -1764,24 +1988,31 @@ static int addtype(const long gmtoff, const char *abbr, const int isdst, const i return i; } -static void leapadd(const time_t t, const int positive, const int rolling, int count) +static void +leapadd(const time_t t, const int positive, const int rolling, int count) { - register int i, j; + register int i, + j; - if (leapcnt + (positive ? count : 1) > TZ_MAX_LEAPS) { + if (leapcnt + (positive ? count : 1) > TZ_MAX_LEAPS) + { error(_("too many leap seconds")); (void) exit(EXIT_FAILURE); } for (i = 0; i < leapcnt; ++i) - if (t <= trans[i]) { - if (t == trans[i]) { + if (t <= trans[i]) + { + if (t == trans[i]) + { error(_("repeated leap second moment")); (void) exit(EXIT_FAILURE); } break; } - do { - for (j = leapcnt; j > i; --j) { + do + { + for (j = leapcnt; j > i; --j) + { trans[j] = trans[j - 1]; corr[j] = corr[j - 1]; roll[j] = roll[j - 1]; @@ -1793,50 +2024,57 @@ static void leapadd(const time_t t, const int positive, const int rolling, int c } while (positive && --count != 0); } -static void adjleap(void) +static void +adjleap(void) { - register int i; - register long last = 0; + register int i; + register long last = 0; /* - ** propagate leap seconds forward - */ - for (i = 0; i < leapcnt; ++i) { + * * propagate leap seconds forward + */ + for (i = 0; i < leapcnt; ++i) + { trans[i] = tadd(trans[i], last); last = corr[i] += last; } } -static int yearistype(const int year, const char *type) +static int +yearistype(const int year, const char *type) { - static char * buf; - int result; + static char *buf; + int result; if (type == NULL || *type == '\0') return TRUE; buf = erealloc(buf, (int) (132 + strlen(yitcommand) + strlen(type))); (void) sprintf(buf, "%s %d %s", yitcommand, year, type); result = system(buf); - if (WIFEXITED(result)) switch (WEXITSTATUS(result)) { - case 0: - return TRUE; - case 1: - return FALSE; - } + if (WIFEXITED(result)) + switch (WEXITSTATUS(result)) + { + case 0: + return TRUE; + case 1: + return FALSE; + } error(_("Wild result from command execution")); (void) fprintf(stderr, _("%s: command was '%s', result was %d\n"), - progname, buf, result); - for ( ; ; ) + progname, buf, result); + for (;;) (void) exit(EXIT_FAILURE); } -static int lowerit(int a) +static int +lowerit(int a) { a = (unsigned char) a; return (isascii(a) && isupper(a)) ? tolower(a) : a; } -static int ciequal(register const char *ap, register const char *bp) +static int +ciequal(register const char *ap, register const char *bp) { while (lowerit(*ap) == lowerit(*bp++)) if (*ap++ == '\0') @@ -1844,71 +2082,83 @@ static int ciequal(register const char *ap, register const char *bp) return FALSE; } -static int itsabbr(register const char *abbr, register const char *word) +static int +itsabbr(register const char *abbr, register const char *word) { if (lowerit(*abbr) != lowerit(*word)) return FALSE; ++word; while (*++abbr != '\0') - do { + do + { if (*word == '\0') return FALSE; } while (lowerit(*word++) != lowerit(*abbr)); return TRUE; } -static const struct lookup *byword(register const char *word, register const struct lookup *table) +static const struct lookup * +byword(register const char *word, register const struct lookup * table) { - register const struct lookup * foundlp; - register const struct lookup * lp; + register const struct lookup *foundlp; + register const struct lookup *lp; if (word == NULL || table == NULL) return NULL; + /* - ** Look for exact match. - */ + * * Look for exact match. + */ for (lp = table; lp->l_word != NULL; ++lp) if (ciequal(word, lp->l_word)) return lp; + /* - ** Look for inexact match. - */ + * * Look for inexact match. + */ foundlp = NULL; for (lp = table; lp->l_word != NULL; ++lp) - if (itsabbr(word, lp->l_word)) { + if (itsabbr(word, lp->l_word)) + { if (foundlp == NULL) foundlp = lp; - else return NULL; /* multiple inexact matches */ + else + return NULL; /* multiple inexact matches */ } return foundlp; } -static char **getfields(register char *cp) +static char ** +getfields(register char *cp) { - register char * dp; - register char ** array; - register int nsubs; + register char *dp; + register char **array; + register int nsubs; if (cp == NULL) return NULL; array = (char **) (void *) emalloc((int) ((strlen(cp) + 1) * sizeof *array)); nsubs = 0; - for ( ; ; ) { + for (;;) + { while (isascii(*cp) && isspace((unsigned char) *cp)) ++cp; if (*cp == '\0' || *cp == '#') break; array[nsubs++] = dp = cp; - do { + do + { if ((*dp = *cp++) != '"') ++dp; - else while ((*dp = *cp++) != '"') - if (*dp != '\0') - ++dp; - else error(_("Odd number of quotation marks")); + else + while ((*dp = *cp++) != '"') + if (*dp != '\0') + ++dp; + else + error(_("Odd number of quotation marks")); } while (*cp != '\0' && *cp != '#' && - (!isascii(*cp) || !isspace((unsigned char) *cp))); + (!isascii(*cp) || !isspace((unsigned char) *cp))); if (isascii(*cp) && isspace((unsigned char) *cp)) ++cp; *dp = '\0'; @@ -1917,28 +2167,32 @@ static char **getfields(register char *cp) return array; } -static long oadd(const long t1, const long t2) +static long +oadd(const long t1, const long t2) { - register long t; + register long t; t = t1 + t2; - if ((t2 > 0 && t <= t1) || (t2 < 0 && t >= t1)) { + if ((t2 > 0 && t <= t1) || (t2 < 0 && t >= t1)) + { error(_("time overflow")); (void) exit(EXIT_FAILURE); } return t; } -static time_t tadd(const time_t t1, const long t2) +static time_t +tadd(const time_t t1, const long t2) { - register time_t t; + register time_t t; if (t1 == max_time && t2 > 0) return max_time; if (t1 == min_time && t2 < 0) return min_time; t = t1 + t2; - if ((t2 > 0 && t <= t1) || (t2 < 0 && t >= t1)) { + if ((t2 > 0 && t <= t1) || (t2 < 0 && t >= t1)) + { error(_("time overflow")); (void) exit(EXIT_FAILURE); } @@ -1950,11 +2204,14 @@ static time_t tadd(const time_t t1, const long t2) ** 1970, 00:00 LOCAL time - in that year that the rule refers to. */ -static time_t rpytime(register const struct rule *rp, register const int wantedy) +static time_t +rpytime(register const struct rule * rp, register const int wantedy) { - register int y, m, i; - register long dayoff; /* with a nod to Margaret O. */ - register time_t t; + register int y, + m, + i; + register long dayoff; /* with a nod to Margaret O. */ + register time_t t; if (wantedy == INT_MIN) return min_time; @@ -1963,60 +2220,74 @@ static time_t rpytime(register const struct rule *rp, register const int wantedy dayoff = 0; m = TM_JANUARY; y = EPOCH_YEAR; - while (wantedy != y) { - if (wantedy > y) { + while (wantedy != y) + { + if (wantedy > y) + { i = len_years[isleap(y)]; ++y; - } else { + } + else + { --y; i = -len_years[isleap(y)]; } dayoff = oadd(dayoff, eitol(i)); } - while (m != rp->r_month) { + while (m != rp->r_month) + { i = len_months[isleap(y)][m]; dayoff = oadd(dayoff, eitol(i)); ++m; } i = rp->r_dayofmonth; - if (m == TM_FEBRUARY && i == 29 && !isleap(y)) { + if (m == TM_FEBRUARY && i == 29 && !isleap(y)) + { if (rp->r_dycode == DC_DOWLEQ) --i; - else { + else + { error(_("use of 2/29 in non leap-year")); (void) exit(EXIT_FAILURE); } } --i; dayoff = oadd(dayoff, eitol(i)); - if (rp->r_dycode == DC_DOWGEQ || rp->r_dycode == DC_DOWLEQ) { - register long wday; + if (rp->r_dycode == DC_DOWGEQ || rp->r_dycode == DC_DOWLEQ) + { + register long wday; #define LDAYSPERWEEK ((long) DAYSPERWEEK) wday = eitol(EPOCH_WDAY); + /* - ** Don't trust mod of negative numbers. - */ + * * Don't trust mod of negative numbers. + */ if (dayoff >= 0) wday = (wday + dayoff) % LDAYSPERWEEK; - else { + else + { wday -= ((-dayoff) % LDAYSPERWEEK); if (wday < 0) wday += LDAYSPERWEEK; } while (wday != eitol(rp->r_wday)) - if (rp->r_dycode == DC_DOWGEQ) { + if (rp->r_dycode == DC_DOWGEQ) + { dayoff = oadd(dayoff, (long) 1); if (++wday >= LDAYSPERWEEK) wday = 0; ++i; - } else { + } + else + { dayoff = oadd(dayoff, (long) -1); if (--wday < 0) wday = LDAYSPERWEEK - 1; --i; } - if (i < 0 || i >= len_months[isleap(y)][m]) { + if (i < 0 || i >= len_months[isleap(y)][m]) + { error(_("no day in month matches rule")); (void) exit(EXIT_FAILURE); } @@ -2027,16 +2298,19 @@ static time_t rpytime(register const struct rule *rp, register const int wantedy return min_time; if (dayoff > max_time / SECSPERDAY) return max_time; - t = (time_t) dayoff * SECSPERDAY; + t = (time_t) dayoff *SECSPERDAY; + return tadd(t, rp->r_tod); } -static void newabbr(const char *string) +static void +newabbr(const char *string) { - register int i; + register int i; i = strlen(string) + 1; - if (charcnt + i > TZ_MAX_CHARS) { + if (charcnt + i > TZ_MAX_CHARS) + { error(_("too many, or too long, time zone abbreviations")); (void) exit(EXIT_FAILURE); } @@ -2044,40 +2318,47 @@ static void newabbr(const char *string) charcnt += eitol(i); } -static int mkdirs(char *argname) +static int +mkdirs(char *argname) { - register char * name; - register char * cp; + register char *name; + register char *cp; if (argname == NULL || *argname == '\0') return 0; cp = name = ecpyalloc(argname); - while ((cp = strchr(cp + 1, '/')) != 0) { + while ((cp = strchr(cp + 1, '/')) != 0) + { *cp = '\0'; #ifdef WIN32 + /* - ** DOS drive specifier? - */ + * * DOS drive specifier? + */ if (isalpha((unsigned char) name[0]) && - name[1] == ':' && name[2] == '\0') { - *cp = '/'; - continue; + name[1] == ':' && name[2] == '\0') + { + *cp = '/'; + continue; } -#endif /* WIN32 */ - if (!itsdir(name)) { +#endif /* WIN32 */ + if (!itsdir(name)) + { /* - ** It doesn't seem to exist, so we try to create it. - ** Creation may fail because of the directory being - ** created by some other multiprocessor, so we get - ** to do extra checking. - */ - if (mkdir(name, MKDIR_UMASK) != 0) { + * * It doesn't seem to exist, so we try to create it. * + * Creation may fail because of the directory being * created + * by some other multiprocessor, so we get * to do extra + * checking. + */ + if (mkdir(name, MKDIR_UMASK) != 0) + { const char *e = strerror(errno); - if (errno != EEXIST || !itsdir(name)) { + if (errno != EEXIST || !itsdir(name)) + { (void) fprintf(stderr, -_("%s: Can't create directory %s: %s\n"), - progname, name, e); + _("%s: Can't create directory %s: %s\n"), + progname, name, e); ifree(name); return -1; } @@ -2089,15 +2370,17 @@ _("%s: Can't create directory %s: %s\n"), return 0; } -static long eitol(const int i) +static long +eitol(const int i) { - long l; + long l; l = i; - if ((i < 0 && l >= 0) || (i == 0 && l != 0) || (i > 0 && l <= 0)) { + if ((i < 0 && l >= 0) || (i == 0 && l != 0) || (i > 0 && l <= 0)) + { (void) fprintf(stderr, - _("%s: %d did not sign extend correctly\n"), - progname, i); + _("%s: %d did not sign extend correctly\n"), + progname, i); (void) exit(EXIT_FAILURE); } return l; @@ -2110,12 +2393,13 @@ static long eitol(const int i) #ifdef WIN32 /* - * To run on win32 + * To run on win32 */ -int link(const char *oldpath, const char *newpath) { - if (!CopyFileEx(oldpath, newpath, NULL, NULL, FALSE, 0)) { +int +link(const char *oldpath, const char *newpath) +{ + if (!CopyFileEx(oldpath, newpath, NULL, NULL, FALSE, 0)) return -1; - } return 0; } #endif |