Update zic from tzcode 2013b.

diff --git a/ChangeLog b/ChangeLog
index 2be9ceba9a01aa5e1ca82840ea43eadb04531f53..2cb0ed60d94728a6b53aa5670b8875ab01b5a51b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-13  Joseph Myers  <joseph@codesourcery.com>
+
+       * timezone/zic.c: Update from tzcode 2013b.
+
 2013-03-12  Carlos O'Donell  <carlos@redhat.com>
 
        * manual/install.texi (Configuring and compiling):

diff --git a/timezone/zic.c b/timezone/zic.c
index a5202a1ac3729a1b7b49f626b270b8356d798d70..91f0d20cc143fcafd86e7ac847ce443bdcb4e42c 100644 (file)
--- a/timezone/zic.c
+++ b/timezone/zic.c
@@ -1748,7 +1748,7 @@ stringoffset(char *result, long offset)
        minutes = offset % MINSPERHOUR;
        offset /= MINSPERHOUR;
        hours = offset;
-       if (hours >= HOURSPERDAY) {
+       if (hours > HOURSPERDAY) {
                result[0] = '\0';
                return -1;
        }
@@ -1851,7 +1851,9 @@ stringzone(char *result, const struct zone *const zpfirst, const int zonecount)
                        rp = &zp->z_rules[i];
                        if (stdrp == NULL || rp->r_hiyear > stdrp->r_hiyear ||
                                (rp->r_hiyear == stdrp->r_hiyear &&
-                               rp->r_month > stdrp->r_month))
+                               (rp->r_month > stdrp->r_month ||
+                               (rp->r_month == stdrp->r_month &&
+                               rp->r_dayofmonth > stdrp->r_dayofmonth))))
                                        stdrp = rp;
                }
                if (stdrp != NULL && stdrp->r_stdoff != 0)