Fix handling of turnaround times.

diff --git a/timezone/zic.c b/timezone/zic.c
index 8e028eb..6fdcfcb 100644 (file)
--- a/timezone/zic.c
+++ b/timezone/zic.c
@@ -1,6 +1,6 @@
 #ifndef lint
 #ifndef NOID
 #ifndef lint
 #ifndef NOID

-static char    elsieid[] = "@(#)zic.c  7.102";
+static char    elsieid[] = "@(#)zic.c  7.104";

 #endif /* !defined NOID */
 #endif /* !defined lint */
 
 #endif /* !defined NOID */
 #endif /* !defined lint */
 


@@ -1616,16 +1616,16 @@ const int                       zonecount;
        typecnt = 0;
        charcnt = 0;
        /*
        typecnt = 0;
        charcnt = 0;
        /*

-       ** A guess that may well be corrected later.
-       */
-       stdoff = 0;
-       /*

        ** 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) {
        ** 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) {

+               /*
+               ** A guess that may well be corrected later.
+               */
+               stdoff = 0;

                zp = &zpfirst[i];
                usestart = i > 0 && (zp - 1)->z_untiltime > min_time;
                useuntil = i < (zonecount - 1);
                zp = &zpfirst[i];
                usestart = i > 0 && (zp - 1)->z_untiltime > min_time;
                useuntil = i < (zonecount - 1);


@@ -1645,8 +1645,7 @@ const int                 zonecount;
                        if (usestart) {
                                addtt(starttime, type);
                                usestart = FALSE;
                        if (usestart) {
                                addtt(starttime, type);
                                usestart = FALSE;

-                       }
-                       else if (stdoff != 0)
+                       } 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)
                                addtt(min_time, type);
                } else for (year = min_year; year <= max_year; ++year) {
                        if (useuntil && year > zp->z_untilrule.r_hiyear)