September 2016 - tz - lists.iana.org

[PROPOSED PATCH] port 'environ' decl to Solaris 10
by Paul Eggert 04 Sep '16

04 Sep '16

POSIX says apps must declare 'environ' themselves. Although this is not necessary on GNU/Linux with _GNU_SOURCE defined, it is needed with stricter environments like Solaris 10. * date.c, zdump.c (environ): Declare even if HAVE_POSIX_DECLS. --- date.c | 3 ++- zdump.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/date.c b/date.c index 4c11f61..512d1ef 100644 --- a/date.c +++ b/date.c @@ -42,8 +42,9 @@ #define SECSPERMIN 60 #endif /* !defined SECSPERMIN */ -#if !HAVE_POSIX_DECLS extern char ** environ; + +#if !HAVE_POSIX_DECLS extern char * optarg; extern int optind; extern char * tzname[]; diff --git a/zdump.c b/zdump.c index 694b04f..f68ba3d 100644 --- a/zdump.c +++ b/zdump.c @@ -258,8 +258,9 @@ enum { SECSPER400YEARS_FITS = SECSPERLYEAR <= INTMAX_MAX / 400 }; # define timezone_t char ** #endif -#if !HAVE_POSIX_DECLS extern char ** environ; + +#if !HAVE_POSIX_DECLS extern int getopt(int argc, char * const argv[], const char * options); extern char * optarg; -- 2.7.4

2 2

[PROPOSED PATCH] * zic.c (dolink): Fix typo (missing newline) in diagnostic.
by Paul Eggert 04 Sep '16

04 Sep '16

--- zic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zic.c b/zic.c index 9c696c6..b8bd0a6 100644 --- a/zic.c +++ b/zic.c @@ -772,7 +772,7 @@ dolink(char const *fromfield, char const *tofield) fromisdir = itsdir(fromname); if (fromisdir) { char const *e = strerror(fromisdir < 0 ? errno : EPERM); - fprintf(stderr, _("%s: link from %s failed: %s"), + fprintf(stderr, _("%s: link from %s failed: %s\n"), progname, fromname, e); exit(EXIT_FAILURE); } -- 2.7.4

1 0

[PROPOSED PATCH] zic fix storage-allocation bug with realloc
by Paul Eggert 04 Sep '16

04 Sep '16

This bug was introduced in last month's Casablanca-in-2037 fix. Problem found by valgrind. * zic.c (outzone): Don't access freed storage. --- zic.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/zic.c b/zic.c index 1c91d5a..9c696c6 100644 --- a/zic.c +++ b/zic.c @@ -2290,7 +2290,7 @@ outzone(const struct zone *zpfirst, int zonecount) register int compat; register bool do_extend; register char version; - struct attype *lastatmax = NULL; + int lastatmax = -1; max_abbr_len = 2 + max_format_len + max_abbrvar_len; max_envvar_len = 2 * max_abbr_len + 5 * 9; @@ -2524,8 +2524,9 @@ outzone(const struct zone *zpfirst, int zonecount) type = addtype(offset, ab, rp->r_stdoff != 0, rp->r_todisstd, rp->r_todisgmt); if (rp->r_hiyear == ZIC_MAX - && ! (lastatmax && ktime < lastatmax->at)) - lastatmax = &attypes[timecnt]; + && ! (0 <= lastatmax + && ktime < attypes[lastatmax].at)) + lastatmax = timecnt; addtt(ktime, type); } } @@ -2557,8 +2558,8 @@ error(_("can't determine time zone abbreviation to use just after until time")); starttime = tadd(starttime, -gmtoff); } } - if (lastatmax) - lastatmax->dontmerge = true; + if (0 <= lastatmax) + attypes[lastatmax].dontmerge = true; if (do_extend) { /* ** If we're extending the explicitly listed observations -- 2.7.4

1 0