[asterisk-commits] tilghman: trunk r82290 - in /trunk: ./ apps/ funcs/ include/asterisk/ main/st...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Sep 12 16:25:58 CDT 2007
Author: tilghman
Date: Wed Sep 12 16:25:57 2007
New Revision: 82290
URL: http://svn.digium.com/view/asterisk?view=rev&rev=82290
Log:
Merged revisions 82285 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r82285 | tilghman | 2007-09-12 15:12:06 -0500 (Wed, 12 Sep 2007) | 4 lines
Working on issue #10531 exposed a rather nasty 64-bit issue on ast_mktime, so we
updated the localtime.c file from source. Next we'll have to write ast_strptime
to match.
........
Modified:
trunk/ (props changed)
trunk/apps/app_sms.c
trunk/funcs/func_strings.c
trunk/include/asterisk/localtime.h
trunk/main/stdtime/localtime.c
trunk/main/stdtime/private.h
trunk/main/stdtime/tzfile.h
Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Modified: trunk/apps/app_sms.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_sms.c?view=diff&rev=82290&r1=82289&r2=82290
==============================================================================
--- trunk/apps/app_sms.c (original)
+++ trunk/apps/app_sms.c Wed Sep 12 16:25:57 2007
@@ -202,7 +202,7 @@
char queue[30]; /*!< queue name */
char oa[20]; /*!< originating address */
char da[20]; /*!< destination address */
- time_t scts; /*!< time stamp, UTC */
+ struct timeval scts; /*!< time stamp, UTC */
unsigned char pid; /*!< protocol ID */
unsigned char dcs; /*!< data coding scheme */
short mr; /*!< message reference - actually a byte, but use -1 for not set */
@@ -766,7 +766,7 @@
h->rx = h->udl = *h->oa = *h->da = h->pid = h->srr = h->udhi = h->rp = h->vp = h->udhl = 0;
h->mr = -1;
h->dcs = 0xF1; /* normal messages class 1 */
- h->scts = time(NULL);
+ h->scts = ast_tvnow();
s = fopen(fn, "r");
if (s) {
if (unlink(fn)) { /* concurrent access, we lost */
@@ -825,7 +825,7 @@
M,
S;
if (sscanf (p, "%d-%d-%dT%d:%d:%d", &Y, &m, &d, &H, &M, &S) == 6) {
- struct tm t;
+ struct ast_tm t = { 0, };
t.tm_year = Y - 1900;
t.tm_mon = m - 1;
t.tm_mday = d;
@@ -833,8 +833,8 @@
t.tm_min = M;
t.tm_sec = S;
t.tm_isdst = -1;
- h->scts = mktime(&t);
- if (h->scts == (time_t) - 1)
+ h->scts = ast_mktime(&t, NULL);
+ if (h->scts.tv_sec == 0)
ast_log(LOG_WARNING, "Bad date/timein %s: %s", fn, p);
}
} else
@@ -925,7 +925,7 @@
snprintf(fn, sizeof(fn), "%s/sms/%s", ast_config_AST_SPOOL_DIR, h->smsc ? h->rx ? "morx" : "mttx" : h->rx ? "mtrx" : "motx");
ast_mkdir(fn, 0777); /* ensure it exists */
ast_copy_string(fn2, fn, sizeof(fn2));
- snprintf(fn2 + strlen(fn2), sizeof(fn2) - strlen(fn2), "/%s.%s-%d", h->queue, isodate(h->scts, buf, sizeof(buf)), seq++);
+ snprintf(fn2 + strlen(fn2), sizeof(fn2) - strlen(fn2), "/%s.%s-%d", h->queue, isodate(h->scts.tv_sec, buf, sizeof(buf)), seq++);
snprintf(fn + strlen(fn), sizeof(fn) - strlen(fn), "/.%s", fn2 + strlen(fn) + 1);
o = fopen(fn, "w");
if (o == NULL)
@@ -982,9 +982,9 @@
}
}
}
- if (h->scts) {
+ if (h->scts.tv_sec) {
char buf[30];
- fprintf(o, "scts=%s\n", isodate(h->scts, buf, sizeof(buf)));
+ fprintf(o, "scts=%s\n", isodate(h->scts.tv_sec, buf, sizeof(buf)));
}
if (h->pid)
fprintf(o, "pid=%d\n", h->pid);
@@ -1027,7 +1027,7 @@
h->udhi = ((h->imsg[2] & 0x40) ? 1 : 0);
h->rp = ((h->imsg[2] & 0x80) ? 1 : 0);
ast_copy_string(h->oa, h->cli, sizeof(h->oa));
- h->scts = time(NULL);
+ h->scts = ast_tvnow();
h->mr = h->imsg[p++];
p += unpackaddress(h->da, h->imsg + p);
h->pid = h->imsg[p++];
@@ -1065,7 +1065,7 @@
p += unpackaddress(h->oa, h->imsg + p);
h->pid = h->imsg[p++];
h->dcs = h->imsg[p++];
- h->scts = unpackdate(h->imsg + p);
+ h->scts.tv_sec = unpackdate(h->imsg + p);
p += 7;
p += unpacksms(h->dcs, h->imsg + p, h->udh, &h->udhl, h->ud, &h->udl, h->udhi);
h->rx = 1; /* received message */
@@ -1116,7 +1116,7 @@
static void sms_compose2(sms_t *h, int more)
{
struct ast_tm tm;
- struct timeval tv = { h->scts, 0 };
+ struct timeval tv = h->scts;
char stm[9];
h->omsg[0] = 0x00; /* set later... */
@@ -1171,7 +1171,7 @@
/* ast_verb(3, "SMS-P2 Frame: %s\n", sms_hexdump(h->imsg, sz, debug_buf)); */
/* Parse message body (called payload) */
- tv.tv_sec = h->scts = time(NULL);
+ tv = h->scts = ast_tvnow();
for (f = 4; f < sz; ) {
msg = h->imsg[f++];
msgsz = h->imsg[f++];
@@ -1186,7 +1186,7 @@
h->udl = msgsz;
break;
case 0x14: /* Date SCTS */
- tv.tv_sec = h->scts = time(NULL);
+ tv = h->scts = ast_tvnow();
ast_localtime(&tv, &tm, NULL);
tm.tm_mon = ( (h->imsg[f] * 10) + h->imsg[f + 1] ) - 1;
tm.tm_mday = ( (h->imsg[f + 2] * 10) + h->imsg[f + 3] );
@@ -1302,7 +1302,7 @@
p += packaddress(h->omsg + p, h->oa);
h->omsg[p++] = h->pid;
h->omsg[p++] = h->dcs;
- packdate(h->omsg + p, h->scts);
+ packdate(h->omsg + p, h->scts.tv_sec);
p += 7;
p += packsms(h->dcs, h->omsg + p, h->udhl, h->udh, h->udl, h->ud);
} else { /* submit */
@@ -1823,7 +1823,7 @@
/* submitting a message, not taking call. */
/* deprecated, use smsq instead */
- h.scts = time(NULL);
+ h.scts = ast_tvnow();
if (ast_strlen_zero(sms_args.addr) || strlen(sms_args.addr) >= sizeof(h.oa)) {
ast_log(LOG_ERROR, "Address too long %s\n", sms_args.addr);
goto done;
Modified: trunk/funcs/func_strings.c
URL: http://svn.digium.com/view/asterisk/trunk/funcs/func_strings.c?view=diff&rev=82290&r1=82289&r2=82290
==============================================================================
--- trunk/funcs/func_strings.c (original)
+++ trunk/funcs/func_strings.c Wed Sep 12 16:25:57 2007
@@ -659,7 +659,8 @@
if (!strptime(args.timestring, args.format, &t.time)) {
ast_log(LOG_WARNING, "C function strptime() output nothing?!!\n");
} else {
- snprintf(buf, len, "%d", (int) ast_mktime(&t.atm, args.timezone));
+ struct timeval tv = ast_mktime(&t.atm, args.timezone);
+ snprintf(buf, len, "%d", (int) tv.tv_sec);
}
return 0;
Modified: trunk/include/asterisk/localtime.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/localtime.h?view=diff&rev=82290&r1=82289&r2=82290
==============================================================================
--- trunk/include/asterisk/localtime.h (original)
+++ trunk/include/asterisk/localtime.h Wed Sep 12 16:25:57 2007
@@ -40,11 +40,8 @@
int tm_usec; /* microseconds */
};
-int ast_tzsetwall(void);
-void ast_tzset(const char *name);
struct ast_tm *ast_localtime(const struct timeval *timep, struct ast_tm *p_tm, const char *zone);
-time_t ast_mktime(struct ast_tm * const tmp, const char *zone);
-char *ast_ctime(const struct timeval * const timep, char *buf);
+struct timeval ast_mktime(struct ast_tm * const tmp, const char *zone);
int ast_strftime(char *buf, size_t len, const char *format, const struct ast_tm *tm);
#endif /* _ASTERISK_LOCALTIME_H */
Modified: trunk/main/stdtime/localtime.c
URL: http://svn.digium.com/view/asterisk/trunk/main/stdtime/localtime.c?view=diff&rev=82290&r1=82289&r2=82290
==============================================================================
--- trunk/main/stdtime/localtime.c (original)
+++ trunk/main/stdtime/localtime.c Wed Sep 12 16:25:57 2007
@@ -26,21 +26,20 @@
/*! \file
*
* Multi-timezone Localtime code
- *
- * \author Leap second handling Bradley White (bww at k.gp.cs.cmu.edu).
- * \author POSIX-style TZ environment variable handling from Guy Harris (guy at auspex.com).
*
+ * The original source from this file may be obtained from ftp://elsie.nci.nih.gov/pub/
*/
/*
- * Asterisk defines
- *
- * Don't mess with these unless you're really sure you know what you're doing.
- */
-#ifndef _THREAD_SAFE
-#define _THREAD_SAFE
-#endif
-#define TZ_STRLEN_MAX 255
+** This file is in the public domain, so clarified as of
+** 1996-06-05 by Arthur David Olson.
+*/
+
+/*
+** Leap second handling from Bradley White.
+** POSIX-style TZ environment variable handling from Guy Harris.
+*/
+
/* #define DEBUG */
/*LINTLIBRARY*/
@@ -51,10 +50,11 @@
#ifdef DEBUG
#include <stdio.h>
#endif
+#include <float.h>
+
#include "private.h"
#include "tzfile.h"
-
#include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
@@ -62,14 +62,27 @@
#include "asterisk/lock.h"
#include "asterisk/localtime.h"
#include "asterisk/strings.h"
+#include "asterisk/linkedlists.h"
+#include "asterisk/utils.h"
#ifndef lint
#ifndef NOID
-static const char elsieid[] = "@(#)localtime.c 7.57";
+static char __attribute__((unused)) elsieid[] = "@(#)localtime.c 8.5";
#endif /* !defined NOID */
#endif /* !defined lint */
-
+#ifndef TZ_ABBR_MAX_LEN
+#define TZ_ABBR_MAX_LEN 16
+#endif /* !defined TZ_ABBR_MAX_LEN */
+
+#ifndef TZ_ABBR_CHAR_SET
+#define TZ_ABBR_CHAR_SET \
+ "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 :+-._"
+#endif /* !defined TZ_ABBR_CHAR_SET */
+
+#ifndef TZ_ABBR_ERR_CHAR
+#define TZ_ABBR_ERR_CHAR '_'
+#endif /* !defined TZ_ABBR_ERR_CHAR */
/*
** SunOS 4.1.1 headers lack O_BINARY.
@@ -82,55 +95,33 @@
#define OPEN_MODE O_RDONLY
#endif /* !defined O_BINARY */
-#ifdef SOLARIS
-#undef TM_ZONE
-#undef TM_GMTOFF
-#endif
-
-#ifdef TM_ZONE
-#ifndef WILDABBR
+static const char gmt[] = "GMT";
+static const struct timeval WRONG = { 0, 0 };
+
/*! \note
- * Someone might make incorrect use of a time zone abbreviation:
- * 1. They might reference tzname[0] before calling ast_tzset (explicitly
- * or implicitly).
- * 2. They might reference tzname[1] before calling ast_tzset (explicitly
- * or implicitly).
- * 3. They might reference tzname[1] after setting to a time zone
- * in which Daylight Saving Time is never observed.
- * 4. They might reference tzname[0] after setting to a time zone
- * in which Standard Time is never observed.
- * 5. They might reference tm.TM_ZONE after calling offtime.
- * What's best to do in the above cases is open to debate;
- * for now, we just set things up so that in any of the five cases
- * WILDABBR is used. Another possibility: initialize tzname[0] to the
- * string "tzname[0] used before set", and similarly for the other cases.
- * And another: initialize tzname[0] to "ERA", with an explanation in the
- * manual page of what this "time zone abbreviation" means (doing this so
- * that tzname[0] has the "normal" length of three characters).
+ * The DST rules to use if TZ has no rules and we can't load TZDEFRULES.
+ * We default to US rules as of 1999-08-17.
+ * POSIX 1003.1 section 8.1.1 says that the default DST rules are
+ * implementation dependent; for historical reasons, US rules are a
+ * common default.
*/
-#define WILDABBR " "
-#endif /* !defined WILDABBR */
-
-static char wildabbr[] = "WILDABBR";
-#endif /* TM_ZONE */
-
-/*! \brief FreeBSD defines 'zone' in 'struct tm' as non-const, so don't declare this
- string as const. */
-static char gmt[] = "GMT";
+#ifndef TZDEFRULESTRING
+#define TZDEFRULESTRING ",M4.1.0,M10.5.0"
+#endif /* !defined TZDEFDST */
/*!< \brief time type information */
-struct ttinfo {
- long tt_gmtoff; /*!< GMT offset in seconds */
- int tt_isdst; /*!< used to set tm_isdst */
- int tt_abbrind; /*!< abbreviation list index */
- int tt_ttisstd; /*!< TRUE if transition is std time */
- int tt_ttisgmt; /*!< TRUE if transition is GMT */
+struct ttinfo { /* time type information */
+ long tt_gmtoff; /* UTC offset in seconds */
+ int tt_isdst; /* used to set tm_isdst */
+ int tt_abbrind; /* abbreviation list index */
+ int tt_ttisstd; /* TRUE if transition is std time */
+ int tt_ttisgmt; /* TRUE if transition is UTC */
};
/*! \brief leap second information */
-struct lsinfo {
- time_t ls_trans; /*!< transition time */
- long ls_corr; /*!< correction to apply */
+struct lsinfo { /* leap second information */
+ time_t ls_trans; /* transition time */
+ long ls_corr; /* correction to apply */
};
#define BIGGEST(a, b) (((a) > (b)) ? (a) : (b))
@@ -141,119 +132,152 @@
#ifndef TZNAME_MAX
#define MY_TZNAME_MAX 255
#endif /* !defined TZNAME_MAX */
+#ifndef TZ_STRLEN_MAX
+#define TZ_STRLEN_MAX 255
+#endif /* !defined TZ_STRLEN_MAX */
struct state {
- char name[TZ_STRLEN_MAX + 1];
+ /*! Name of the file that this references */
+ char name[TZ_STRLEN_MAX + 1];
int leapcnt;
int timecnt;
int typecnt;
int charcnt;
+ int goback;
+ int goahead;
time_t ats[TZ_MAX_TIMES];
unsigned char types[TZ_MAX_TIMES];
struct ttinfo ttis[TZ_MAX_TYPES];
char chars[BIGGEST(BIGGEST(TZ_MAX_CHARS + 1, sizeof gmt),
(2 * (MY_TZNAME_MAX + 1)))];
struct lsinfo lsis[TZ_MAX_LEAPS];
- struct state *next;
+ AST_LIST_ENTRY(state) list;
};
struct rule {
- int r_type; /*!< type of rule--see below */
- int r_day; /*!< day number of rule */
- int r_week; /*!< week number of rule */
- int r_mon; /*!< month number of rule */
- long r_time; /*!< transition time of rule */
+ int r_type; /* type of rule--see below */
+ int r_day; /* day number of rule */
+ int r_week; /* week number of rule */
+ int r_mon; /* month number of rule */
+ long r_time; /* transition time of rule */
};
-#define JULIAN_DAY 0 /*!< Jn - Julian day */
-#define DAY_OF_YEAR 1 /*!< n - day of year */
-#define MONTH_NTH_DAY_OF_WEEK 2 /*!< Mm.n.d - month, week, day of week */
+#define JULIAN_DAY 0 /* Jn - Julian day */
+#define DAY_OF_YEAR 1 /* n - day of year */
+#define MONTH_NTH_DAY_OF_WEEK 2 /* Mm.n.d - month, week, day of week */
/*
** Prototypes for static functions.
*/
static long detzcode P((const char * codep));
+static time_t detzcode64 P((const char * codep));
+static int differ_by_repeat P((time_t t1, time_t t0));
+static const char * getzname P((const char * strp));
+static const char * getqzname P((const char * strp, const int delim));
static const char * getnum P((const char * strp, int * nump, int min,
int max));
static const char * getsecs P((const char * strp, long * secsp));
static const char * getoffset P((const char * strp, long * offsetp));
static const char * getrule P((const char * strp, struct rule * rulep));
-static void gmtload P((struct state * sp));
-static void gmtsub P((const struct timeval * timep, long offset,
- struct ast_tm * tmp, const char * zone));
-static void localsub P((const struct timeval * timep, long offset,
- struct ast_tm * tmp, const char * zone));
+static int gmtload P((struct state * sp));
+static struct ast_tm * gmtsub P((const struct timeval * timep, long offset,
+ struct ast_tm * tmp));
+static struct ast_tm * localsub P((const struct timeval * timep, long offset,
+ struct ast_tm * tmp, const struct state *sp));
static int increment_overflow P((int * number, int delta));
+static int leaps_thru_end_of P((int y));
+static int long_increment_overflow P((long * number, int delta));
+static int long_normalize_overflow P((long * tensptr,
+ int * unitsptr, const int base));
static int normalize_overflow P((int * tensptr, int * unitsptr,
- int base));
-static time_t time1 P((struct ast_tm * tmp,
- void(*funcp) P((const struct timeval *,
- long, struct ast_tm *, const char *)),
- long offset, const char * zone));
-static time_t time2 P((struct ast_tm *tmp,
- void(*funcp) P((const struct timeval *,
- long, struct ast_tm *, const char *)),
- long offset, int * okayp, const char * zone));
-static void timesub P((const struct timeval * timep, long offset,
- const struct state * sp, struct ast_tm *tmp));
-static int tmcomp P((const struct ast_tm *atmp,
+ const int base));
+static struct timeval time1 P((struct ast_tm * tmp,
+ struct ast_tm * (*funcp) P((const struct timeval *,
+ long, struct ast_tm *, const struct state *sp)),
+ long offset, const struct state *sp));
+static struct timeval time2 P((struct ast_tm *tmp,
+ struct ast_tm * (*funcp) P((const struct timeval *,
+ long, struct ast_tm*, const struct state *sp)),
+ long offset, int * okayp, const struct state *sp));
+static struct timeval time2sub P((struct ast_tm *tmp,
+ struct ast_tm * (*funcp) (const struct timeval *,
+ long, struct ast_tm*, const struct state *sp),
+ long offset, int * okayp, int do_norm_secs, const struct state *sp));
+static struct ast_tm * timesub P((const struct timeval * timep, long offset,
+ const struct state * sp, struct ast_tm * tmp));
+static int tmcomp P((const struct ast_tm * atmp,
const struct ast_tm * btmp));
static time_t transtime P((time_t janfirst, int year,
const struct rule * rulep, long offset));
-static int tzload P((const char * name, struct state * sp));
+static int tzload P((const char * name, struct state * sp,
+ int doextend));
static int tzparse P((const char * name, struct state * sp,
int lastditch));
-static struct state * lclptr = NULL;
-static struct state * last_lclptr = NULL;
-static struct state * gmtptr = NULL;
+static AST_LIST_HEAD_STATIC(zonelist, state);
#ifndef TZ_STRLEN_MAX
#define TZ_STRLEN_MAX 255
#endif /* !defined TZ_STRLEN_MAX */
-static int gmt_is_set;
-#ifdef _THREAD_SAFE
-AST_MUTEX_DEFINE_STATIC(lcl_mutex);
-AST_MUTEX_DEFINE_STATIC(tzset_mutex);
-AST_MUTEX_DEFINE_STATIC(tzsetwall_mutex);
-AST_MUTEX_DEFINE_STATIC(gmt_mutex);
-#endif
-
-/*
+/*! \note
** Section 4.12.3 of X3.159-1989 requires that
** Except for the strftime function, these functions [asctime,
** ctime, gmtime, localtime] return values in one of two static
** objects: a broken-down time structure and an array of char.
-** Thanks to Paul Eggert (eggert at twinsun.com) for noting this.
+** Thanks to Paul Eggert for noting this.
*/
-static long detzcode(const char * const codep)
-{
- register long result;
- register int i;
-
- result = (codep[0] & 0x80) ? ~0L : 0L;
+static long detzcode(const char * const codep)
+{
+ long result;
+ int i;
+
+ result = (codep[0] & 0x80) ? ~0L : 0;
for (i = 0; i < 4; ++i)
result = (result << 8) | (codep[i] & 0xff);
return result;
}
-static int tzload(register const char *name, register struct state *const sp)
-{
- register const char * p;
- register int i;
- register int fid;
-
-#ifdef DEBUG
- fprintf(stderr,"tzload called with name=%s, sp=%d\n", name, sp);
-#endif
+static time_t detzcode64(const char * const codep)
+{
+ time_t result;
+ int i;
+
+ result = (codep[0] & 0x80) ? (~(int_fast64_t) 0) : 0;
+ for (i = 0; i < 8; ++i)
+ result = result * 256 + (codep[i] & 0xff);
+ return result;
+}
+
+static int differ_by_repeat(const time_t t1, const time_t t0)
+{
+ const long long at1 = t1, at0 = t0;
+ if (TYPE_INTEGRAL(time_t) &&
+ TYPE_BIT(time_t) - TYPE_SIGNED(time_t) < SECSPERREPEAT_BITS)
+ return 0;
+ return at1 - at0 == SECSPERREPEAT;
+}
+
+static int tzload(const char *name, struct state * const sp, const int doextend)
+{
+ const char * p;
+ int i;
+ int fid;
+ int stored;
+ int nread;
+ union {
+ struct tzhead tzhead;
+ char buf[2 * sizeof(struct tzhead) +
+ 2 * sizeof *sp +
+ 4 * TZ_MAX_TIMES];
+ } u;
+
if (name == NULL && (name = TZDEFAULT) == NULL)
return -1;
{
- register int doaccess;
- struct stat stab;
+ int doaccess;
/*
** Section 4.9.1 of the C standard says that
** "FILENAME_MAX expands to an integral constant expression
@@ -261,7 +285,7 @@
** to hold the longest file name string that the implementation
** guarantees can be opened."
*/
- char fullname[FILENAME_MAX + 1] = "";
+ char fullname[FILENAME_MAX + 1];
if (name[0] == ':')
++name;
@@ -269,11 +293,11 @@
if (!doaccess) {
if ((p = TZDIR) == NULL)
return -1;
- if ((strlen(p) + 1 + strlen(name) + 1) >= sizeof fullname)
+ if ((strlen(p) + strlen(name) + 1) >= sizeof fullname)
return -1;
- (void) strncpy(fullname, p, sizeof(fullname) - 1);
- (void) strncat(fullname, "/", sizeof(fullname) - strlen(fullname) - 1);
- (void) strncat(fullname, name, sizeof(fullname) - strlen(fullname) - 1);
+ (void) strcpy(fullname, p);
+ (void) strcat(fullname, "/");
+ (void) strcat(fullname, name);
/*
** Set doaccess if '.' (as in "../") shows up in name.
*/
@@ -282,37 +306,24 @@
name = fullname;
}
if (doaccess && access(name, R_OK) != 0)
- return -1;
+ return -1;
if ((fid = open(name, OPEN_MODE)) == -1)
return -1;
- if ((fstat(fid, &stab) < 0) || !S_ISREG(stab.st_mode)) {
- close(fid);
- return -1;
- }
- }
- {
- struct tzhead * tzhp;
- char buf[sizeof *sp + sizeof *tzhp];
+ }
+ nread = read(fid, u.buf, sizeof u.buf);
+ if (close(fid) < 0 || nread <= 0)
+ return -1;
+ for (stored = 4; stored <= 8; stored *= 2) {
int ttisstdcnt;
int ttisgmtcnt;
- i = read(fid, buf, sizeof buf);
- if (close(fid) != 0)
- return -1;
- p = buf;
- p += (sizeof tzhp->tzh_magic) + (sizeof tzhp->tzh_reserved);
- ttisstdcnt = (int) detzcode(p);
- p += 4;
- ttisgmtcnt = (int) detzcode(p);
- p += 4;
- sp->leapcnt = (int) detzcode(p);
- p += 4;
- sp->timecnt = (int) detzcode(p);
- p += 4;
- sp->typecnt = (int) detzcode(p);
- p += 4;
- sp->charcnt = (int) detzcode(p);
- p += 4;
+ ttisstdcnt = (int) detzcode(u.tzhead.tzh_ttisstdcnt);
+ ttisgmtcnt = (int) detzcode(u.tzhead.tzh_ttisgmtcnt);
+ sp->leapcnt = (int) detzcode(u.tzhead.tzh_leapcnt);
+ sp->timecnt = (int) detzcode(u.tzhead.tzh_timecnt);
+ sp->typecnt = (int) detzcode(u.tzhead.tzh_typecnt);
+ sp->charcnt = (int) detzcode(u.tzhead.tzh_charcnt);
+ p = u.tzhead.tzh_charcnt + sizeof u.tzhead.tzh_charcnt;
if (sp->leapcnt < 0 || sp->leapcnt > TZ_MAX_LEAPS ||
sp->typecnt <= 0 || sp->typecnt > TZ_MAX_TYPES ||
sp->timecnt < 0 || sp->timecnt > TZ_MAX_TIMES ||
@@ -320,17 +331,19 @@
(ttisstdcnt != sp->typecnt && ttisstdcnt != 0) ||
(ttisgmtcnt != sp->typecnt && ttisgmtcnt != 0))
return -1;
- if (i - (p - buf) < sp->timecnt * 4 + /* ats */
+ if (nread - (p - u.buf) <
+ sp->timecnt * stored + /* ats */
sp->timecnt + /* types */
- sp->typecnt * (4 + 2) + /* ttinfos */
+ sp->typecnt * 6 + /* ttinfos */
sp->charcnt + /* chars */
- sp->leapcnt * (4 + 4) + /* lsinfos */
+ sp->leapcnt * (stored + 4) + /* lsinfos */
ttisstdcnt + /* ttisstds */
ttisgmtcnt) /* ttisgmts */
return -1;
for (i = 0; i < sp->timecnt; ++i) {
- sp->ats[i] = detzcode(p);
- p += 4;
+ sp->ats[i] = (stored == 4) ?
+ detzcode(p) : detzcode64(p);
+ p += stored;
}
for (i = 0; i < sp->timecnt; ++i) {
sp->types[i] = (unsigned char) *p++;
@@ -338,7 +351,7 @@
return -1;
}
for (i = 0; i < sp->typecnt; ++i) {
- register struct ttinfo * ttisp;
+ struct ttinfo * ttisp;
ttisp = &sp->ttis[i];
ttisp->tt_gmtoff = detzcode(p);
@@ -355,16 +368,17 @@
sp->chars[i] = *p++;
sp->chars[i] = '\0'; /* ensure '\0' at end */
for (i = 0; i < sp->leapcnt; ++i) {
- register struct lsinfo * lsisp;
+ struct lsinfo * lsisp;
lsisp = &sp->lsis[i];
- lsisp->ls_trans = detzcode(p);
- p += 4;
+ lsisp->ls_trans = (stored == 4) ?
+ detzcode(p) : detzcode64(p);
+ p += stored;
lsisp->ls_corr = detzcode(p);
p += 4;
}
for (i = 0; i < sp->typecnt; ++i) {
- register struct ttinfo * ttisp;
+ struct ttinfo * ttisp;
ttisp = &sp->ttis[i];
if (ttisstdcnt == 0)
@@ -377,7 +391,7 @@
}
}
for (i = 0; i < sp->typecnt; ++i) {
- register struct ttinfo * ttisp;
+ struct ttinfo * ttisp;
ttisp = &sp->ttis[i];
if (ttisgmtcnt == 0)
@@ -389,7 +403,90 @@
return -1;
}
}
- }
+ /*
+ ** Out-of-sort ats should mean we're running on a
+ ** signed time_t system but using a data file with
+ ** unsigned values (or vice versa).
+ */
+ for (i = 0; i < sp->timecnt - 2; ++i)
+ if (sp->ats[i] > sp->ats[i + 1]) {
+ ++i;
+ if (TYPE_SIGNED(time_t)) {
+ /*
+ ** Ignore the end (easy).
+ */
+ sp->timecnt = i;
+ } else {
+ /*
+ ** Ignore the beginning (harder).
+ */
+ int j;
+
+ for (j = 0; j + i < sp->timecnt; ++j) {
+ sp->ats[j] = sp->ats[j + i];
+ sp->types[j] = sp->types[j + i];
+ }
+ sp->timecnt = j;
+ }
+ break;
+ }
+ /*
+ ** If this is an old file, we're done.
+ */
+ if (u.tzhead.tzh_version[0] == '\0')
+ break;
+ nread -= p - u.buf;
+ for (i = 0; i < nread; ++i)
+ u.buf[i] = p[i];
+ /*
+ ** If this is a narrow integer time_t system, we're done.
+ */
+ if (stored >= (int) sizeof(time_t) && TYPE_INTEGRAL(time_t))
+ break;
+ }
+ if (doextend && nread > 2 &&
+ u.buf[0] == '\n' && u.buf[nread - 1] == '\n' &&
+ sp->typecnt + 2 <= TZ_MAX_TYPES) {
+ struct state ts;
+ int result;
+
+ u.buf[nread - 1] = '\0';
+ result = tzparse(&u.buf[1], &ts, FALSE);
+ if (result == 0 && ts.typecnt == 2 &&
+ sp->charcnt + ts.charcnt <= TZ_MAX_CHARS) {
+ for (i = 0; i < 2; ++i)
+ ts.ttis[i].tt_abbrind +=
+ sp->charcnt;
+ for (i = 0; i < ts.charcnt; ++i)
+ sp->chars[sp->charcnt++] =
+ ts.chars[i];
+ i = 0;
+ while (i < ts.timecnt &&
+ ts.ats[i] <=
+ sp->ats[sp->timecnt - 1])
+ ++i;
+ while (i < ts.timecnt &&
+ sp->timecnt < TZ_MAX_TIMES) {
+ sp->ats[sp->timecnt] =
+ ts.ats[i];
+ sp->types[sp->timecnt] =
+ sp->typecnt +
+ ts.types[i];
+ ++sp->timecnt;
+ ++i;
+ }
+ sp->ttis[sp->typecnt++] = ts.ttis[0];
+ sp->ttis[sp->typecnt++] = ts.ttis[1];
+ }
+ }
+ i = 2 * YEARSPERREPEAT;
+ sp->goback = sp->goahead = sp->timecnt > i;
+ sp->goback = sp->goback && sp->types[i] == sp->types[0] &&
+ differ_by_repeat(sp->ats[i], sp->ats[0]);
+ sp->goahead = sp->goahead &&
+ sp->types[sp->timecnt - 1] == sp->types[sp->timecnt - 1 - i] &&
+ differ_by_repeat(sp->ats[sp->timecnt - 1],
+ sp->ats[sp->timecnt - 1 - i]);
return 0;
}
@@ -403,16 +500,50 @@
};
/*! \brief
- * Given a pointer into a time zone string, extract a number from that string.
- * \return Check that the number is within a specified range; if it is not, return
- * NULL.
- * Otherwise, return a pointer to the first character not part of the number.
+** Given a pointer into a time zone string, scan until a character that is not
+** a valid character in a zone name is found. Return a pointer to that
+** character.
*/
-static const char *getnum(register const char *strp, int * const nump, const int min, const int max)
-{
- register char c;
- register int num;
+static const char * getzname(const char *strp)
+{
+ char c;
+
+ while ((c = *strp) != '\0' && !is_digit(c) && c != ',' && c != '-' &&
+ c != '+')
+ ++strp;
+ return strp;
+}
+
+/*! \brief
+** Given a pointer into an extended time zone string, scan until the ending
+** delimiter of the zone name is located. Return a pointer to the delimiter.
+**
+** As with getzname above, the legal character set is actually quite
+** restricted, with other characters producing undefined results.
+** We don't do any checking here; checking is done later in common-case code.
+*/
+
+static const char * getqzname(const char *strp, const int delim)
+{
+ int c;
+
+ while ((c = *strp) != '\0' && c != delim)
+ ++strp;
+ return strp;
+}
+
+/*! \brief
+** Given a pointer into a time zone string, extract a number from that string.
+** Check that the number is within a specified range; if it is not, return
+** NULL.
+** Otherwise, return a pointer to the first character not part of the number.
+*/
+
+static const char *getnum(const char *strp, int *nump, const int min, const int max)
+{
+ char c;
+ int num;
if (strp == NULL || !is_digit(c = *strp))
return NULL;
@@ -430,14 +561,14 @@
}
/*! \brief
- * Given a pointer into a time zone string, extract a number of seconds,
- * in hh[:mm[:ss]] form, from the string.
- * \return If any error occurs, return NULL.
- * Otherwise, return a pointer to the first character not part of the number
- * of seconds.
+** Given a pointer into a time zone string, extract a number of seconds,
+** in hh[:mm[:ss]] form, from the string.
+** If any error occurs, return NULL.
+** Otherwise, return a pointer to the first character not part of the number
+** of seconds.
*/
-static const char *getsecs(register const char *strp, long * const secsp)
+static const char *getsecs(const char *strp, long * const secsp)
{
int num;
@@ -459,7 +590,7 @@
*secsp += num * SECSPERMIN;
if (*strp == ':') {
++strp;
- /* `SECSPERMIN' allows for leap seconds. */
+ /* `SECSPERMIN' allows for leap seconds. */
strp = getnum(strp, &num, 0, SECSPERMIN);
if (strp == NULL)
return NULL;
@@ -470,15 +601,15 @@
}
/*! \brief
- * Given a pointer into a time zone string, extract an offset, in
- * [+-]hh[:mm[:ss]] form, from the string.
- * \return If any error occurs, return NULL.
- * Otherwise, return a pointer to the first character not part of the time.
+** Given a pointer into a time zone string, extract an offset, in
+** [+-]hh[:mm[:ss]] form, from the string.
+** If any error occurs, return NULL.
+** Otherwise, return a pointer to the first character not part of the time.
*/
-static const char * getoffset(register const char *strp, long * const offsetp)
-{
- register int neg = 0;
+static const char *getoffset(const char *strp, long *offsetp)
+{
+ int neg = 0;
if (*strp == '-') {
neg = 1;
@@ -494,13 +625,13 @@
}
/*! \brief
- * Given a pointer into a time zone string, extract a rule in the form
- * date[/time]. See POSIX section 8 for the format of "date" and "time".
- * \return If a valid rule is not found, return NULL.
- * Otherwise, return a pointer to the first character not part of the rule.
+** Given a pointer into a time zone string, extract a rule in the form
+** date[/time]. See POSIX section 8 for the format of "date" and "time".
+** If a valid rule is not found, return NULL.
+** Otherwise, return a pointer to the first character not part of the rule.
*/
-static const char *getrule(const char *strp, register struct rule * const rulep)
+static const char *getrule(const char *strp, struct rule *rulep)
{
if (*strp == 'J') {
/*
@@ -546,22 +677,19 @@
}
/*! \brief
- * Given the Epoch-relative time of January 1, 00:00:00 GMT, in a year, the
- * year, a rule, and the offset from GMT at the time that rule takes effect,
- * calculate the Epoch-relative time that rule takes effect.
+** Given the Epoch-relative time of January 1, 00:00:00 UTC, in a year, the
+** year, a rule, and the offset from UTC at the time that rule takes effect,
+** calculate the Epoch-relative time that rule takes effect.
*/
-static time_t transtime(janfirst, year, rulep, offset)
-const time_t janfirst;
-const int year;
-register const struct rule * const rulep;
-const long offset;
-{
- register int leapyear;
- register time_t value = 0;
- register int i;
+static time_t transtime(const time_t janfirst, const int year, const struct rule *rulep, const long offset)
+{
+ int leapyear;
+ time_t value;
+ int i;
int d, m1, yy0, yy1, yy2, dow;
+ INITIALIZE(value);
leapyear = isleap(year);
switch (rulep->r_type) {
@@ -609,7 +737,7 @@
dow += DAYSPERWEEK;
/*
- ** "dow" is the day-of-week of the first day of the month. Get
+ ** "dow" is the day-of-week of the first day of the month. Get
** the day-of-month (zero-origin) of the first "dow" day of the
** month.
*/
@@ -631,54 +759,87 @@
}
/*
- ** "value" is the Epoch-relative time of 00:00:00 GMT on the day in
- ** question. To get the Epoch-relative time of the specified local
+ ** "value" is the Epoch-relative time of 00:00:00 UTC on the day in
+ ** question. To get the Epoch-relative time of the specified local
** time on that day, add the transition time and the current offset
- ** from GMT.
+ ** from UTC.
*/
return value + rulep->r_time + offset;
}
-/*
+/*! \note
** Given a POSIX section 8-style TZ string, fill in the rule tables as
** appropriate.
*/
-static int
-tzparse(name, sp, lastditch)
-const char * name;
-register struct state * const sp;
-const int lastditch;
+static int tzparse(const char *name, struct state *sp, const int lastditch)
{
const char * stdname;
- const char * dstname = NULL;
- size_t stdlen = 0;
- size_t dstlen = 0;
- long stdoffset = 0L;
- long dstoffset = 0L;
- register time_t * atp;
- register unsigned char * typep;
- register char * cp;
- register int load_result;
-
+ const char * dstname;
+ size_t stdlen;
+ size_t dstlen;
+ long stdoffset;
+ long dstoffset;
+ time_t * atp;
+ unsigned char * typep;
+ char * cp;
+ int load_result;
+
+ INITIALIZE(dstname);
stdname = name;
-#ifdef DEBUG
- fprintf(stderr, "tzparse(): loading default rules\n");
-#endif
- load_result = tzload(TZDEFRULES, sp);
+ if (lastditch) {
+ stdlen = strlen(name); /* length of standard zone name */
+ name += stdlen;
+ if (stdlen >= sizeof sp->chars)
+ stdlen = (sizeof sp->chars) - 1;
+ stdoffset = 0;
+ } else {
+ if (*name == '<') {
+ name++;
+ stdname = name;
+ name = getqzname(name, '>');
+ if (*name != '>')
+ return -1;
+ stdlen = name - stdname;
+ name++;
+ } else {
+ name = getzname(name);
+ stdlen = name - stdname;
+ }
+ if (*name == '\0')
+ return -1;
+ name = getoffset(name, &stdoffset);
+ if (name == NULL)
+ return -1;
+ }
+ load_result = tzload(TZDEFRULES, sp, FALSE);
if (load_result != 0)
sp->leapcnt = 0; /* so, we're off a little */
if (*name != '\0') {
+ if (*name == '<') {
+ dstname = ++name;
+ name = getqzname(name, '>');
+ if (*name != '>')
+ return -1;
+ dstlen = name - dstname;
+ name++;
+ } else {
+ dstname = name;
+ name = getzname(name);
+ dstlen = name - dstname; /* length of DST zone name */
+ }
if (*name != '\0' && *name != ',' && *name != ';') {
name = getoffset(name, &dstoffset);
if (name == NULL)
return -1;
} else dstoffset = stdoffset - SECSPERHOUR;
+ if (*name == '\0' && load_result != 0)
+ name = TZDEFRULESTRING;
if (*name == ',' || *name == ';') {
struct rule start;
struct rule end;
- register int year;
- register time_t janfirst;
+ int year;
+ time_t janfirst;
time_t starttime;
time_t endtime;
@@ -693,11 +854,8 @@
return -1;
sp->typecnt = 2; /* standard time and DST */
/*
- ** Two transitions per year, from EPOCH_YEAR to 2037.
+ ** Two transitions per year, from EPOCH_YEAR forward.
*/
- sp->timecnt = 2 * (2037 - EPOCH_YEAR + 1);
- if (sp->timecnt > TZ_MAX_TIMES)
- return -1;
sp->ttis[0].tt_gmtoff = -dstoffset;
sp->ttis[0].tt_isdst = 1;
sp->ttis[0].tt_abbrind = stdlen + 1;
@@ -707,7 +865,12 @@
atp = sp->ats;
typep = sp->types;
janfirst = 0;
- for (year = EPOCH_YEAR; year <= 2037; ++year) {
+ sp->timecnt = 0;
+ for (year = EPOCH_YEAR;
+ sp->timecnt + 2 <= TZ_MAX_TIMES;
+ ++year) {
+ time_t newfirst;
+
starttime = transtime(janfirst, year, &start,
stdoffset);
endtime = transtime(janfirst, year, &end,
@@ -723,20 +886,23 @@
*atp++ = endtime;
*typep++ = 1; /* DST ends */
}
- janfirst += year_lengths[isleap(year)] *
+ sp->timecnt += 2;
+ newfirst = janfirst;
+ newfirst += year_lengths[isleap(year)] *
SECSPERDAY;
+ if (newfirst <= janfirst)
+ break;
+ janfirst = newfirst;
}
} else {
- register long theirstdoffset;
- register long theirdstoffset;
- register long theiroffset;
- register int isdst;
- register int i;
- register int j;
+ long theirstdoffset;
+ long theirdstoffset;
+ long theiroffset;
+ int isdst;
+ int i;
+ int j;
if (*name != '\0')
- return -1;
- if (load_result != 0)
return -1;
/*
** Initial values of theirstdoffset and theirdstoffset.
@@ -811,6 +977,7 @@
sp->ttis[1].tt_gmtoff = -dstoffset;
sp->ttis[1].tt_isdst = TRUE;
sp->ttis[1].tt_abbrind = stdlen + 1;
+ sp->typecnt = 2;
}
} else {
dstlen = 0;
@@ -823,7 +990,7 @@
sp->charcnt = stdlen + 1;
if (dstlen != 0)
sp->charcnt += dstlen + 1;
- if (sp->charcnt > sizeof sp->chars)
+ if ((size_t) sp->charcnt > sizeof sp->chars)
return -1;
cp = sp->chars;
(void) strncpy(cp, stdname, stdlen);
@@ -836,202 +1003,124 @@
return 0;
}
-static void
-gmtload(sp)
-struct state * const sp;
-{
- if (tzload(gmt, sp) != 0)
- (void) tzparse(gmt, sp, TRUE);
-}
-
-/*
-** A non-static declaration of ast_tzsetwall in a system header file
-** may cause a warning about this upcoming static declaration...
-*/
-static
-#ifdef _THREAD_SAFE
-int
-ast_tzsetwall_basic P((void))
-#else
-int
-ast_tzsetwall P((void))
-#endif
-{
- struct state *cur_state = lclptr;
-
- /* Find the appropriate structure, if already parsed */
- while (cur_state != NULL) {
- if (cur_state->name[0] == '\0')
- break;
- cur_state = cur_state->next;
- }
- if (cur_state != NULL)
- return 0;
- cur_state = malloc(sizeof(struct state));
- if (cur_state == NULL) {
+static int gmtload(struct state *sp)
+{
+ if (tzload(gmt, sp, TRUE) != 0)
+ return tzparse(gmt, sp, TRUE);
+ else
return -1;
- }
- memset(cur_state,0,sizeof(struct state));
- if (tzload((char *) NULL, cur_state) != 0)
-#ifdef DEBUG
- {
- fprintf(stderr, "ast_tzsetwall: calling gmtload()\n");
-#endif
- gmtload(cur_state);
-#ifdef DEBUG
- }
-#endif
-
- if (last_lclptr)
- last_lclptr->next = cur_state;
- else
- lclptr = cur_state;
- last_lclptr = cur_state;
- return 0;
-}
-
-#ifdef _THREAD_SAFE
-int
-ast_tzsetwall P((void))
-{
- ast_mutex_lock(&tzsetwall_mutex);
- ast_tzsetwall_basic();
- ast_mutex_unlock(&tzsetwall_mutex);
- return 0;
-}
-#endif
-
-#ifdef _THREAD_SAFE
-static int
-ast_tzset_basic P((const char *name))
-#else
-int
-ast_tzset P((const char *name))
-#endif
-{
- struct state *cur_state = lclptr;
-
- /* Not set at all */
- if (name == NULL) {
- return ast_tzsetwall();
- }
-
- /* Find the appropriate structure, if already parsed */
- while (cur_state != NULL) {
- if (!strcmp(cur_state->name,name))
- break;
- cur_state = cur_state->next;
- }
- if (cur_state != NULL)
- return 0;
-
- cur_state = malloc(sizeof(struct state));
- if (cur_state == NULL) {
- return -1;
- }
- memset(cur_state,0,sizeof(*cur_state));
-
- /* Name is set, but set to the empty string == no adjustments */
- if (name[0] == '\0') {
- /*
- ** User wants it fast rather than right.
- */
- cur_state->leapcnt = 0; /* so, we're off a little */
- cur_state->timecnt = 0;
- cur_state->ttis[0].tt_gmtoff = 0;
- cur_state->ttis[0].tt_abbrind = 0;
- (void) strncpy(cur_state->chars, gmt, sizeof(cur_state->chars) - 1);
- } else if (tzload(name, cur_state) != 0) {
- if (name[0] == ':') {
- (void) gmtload(cur_state);
- } else if (tzparse(name, cur_state, FALSE) != 0) {
- /* If not found, load localtime */
- if (tzload("/etc/localtime", cur_state) != 0)
- /* Last ditch, get GMT */
- (void) gmtload(cur_state);
- }
- }
- strncpy(cur_state->name, name, sizeof(cur_state->name) - 1);
- if (last_lclptr)
- last_lclptr->next = cur_state;
- else
- lclptr = cur_state;
- last_lclptr = cur_state;
- return 0;
-}
-
-#ifdef _THREAD_SAFE
-void
-ast_tzset P((const char *name))
-{
- ast_mutex_lock(&tzset_mutex);
- ast_tzset_basic(name);
- ast_mutex_unlock(&tzset_mutex);
-}
-#endif
-
-/*
+}
+
+static const struct state *ast_tzset(const char *zone)
+{
+ struct state *sp;
+
+ if (ast_strlen_zero(zone))
+ zone = "/etc/localtime";
+
+ AST_LIST_LOCK(&zonelist);
+ AST_LIST_TRAVERSE(&zonelist, sp, list) {
+ if (!strcmp(sp->name, zone)) {
+ AST_LIST_UNLOCK(&zonelist);
+ return sp;
+ }
+ }
+ AST_LIST_UNLOCK(&zonelist);
+
+ if (!(sp = ast_calloc(1, sizeof *sp)))
+ return NULL;
+
+ if (tzload(zone, sp, TRUE) != 0) {
+ if (zone[0] == ':' || tzparse(zone, sp, FALSE) != 0)
+ (void) gmtload(sp);
+ }
+ ast_copy_string(sp->name, zone, sizeof(sp->name));
+ AST_LIST_LOCK(&zonelist);
[... 1331 lines stripped ...]
More information about the asterisk-commits
mailing list