[BZ #3137]

2006-11-14  Ulrich Drepper  <drepper@redhat.com>
	* timezone/zdump.c: Redo fix for BZ #3137.

	* timezone/scheck.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index f60d058..eff033d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-11-14  Ulrich Drepper  <drepper@redhat.com>
+
+       * timezone/zdump.c: Redo fix for BZ #3137.
+
 2006-11-10  Ulrich Drepper  <drepper@redhat.com>
 
        * timezone/africa: Update from tzdata2006o.
@@ -17,7 +21,7 @@
        * timezone/checktab.awk: Update from tzcode2006o.
        * timezone/ialloc.c: Likewise.
        * timezone/private.h: Likewise.
-       * timezone/scheck.: Likewise.
+       * timezone/scheck.c: Likewise.
        * timezone/tzfile.h: Likewise.
        * timezone/tzselect.ksh: Likewise.
        * timezone/zdump.c: Likewise.

diff --git a/time/tzfile.c b/time/tzfile.c
index 295f0aa..ea2d7ca 100644 (file)
--- a/time/tzfile.c
+++ b/time/tzfile.c
@@ -279,7 +279,9 @@ __tzfile_read (const char *file, size_t extra, char **extrap)
     if (__builtin_expect (type_idxs[i] >= num_types, 0))
       goto lose;
 
-  if (BYTE_ORDER != BIG_ENDIAN || (sizeof (time_t) == 8 && trans_width == 4))
+  if ((BYTE_ORDER != BIG_ENDIAN && (sizeof (time_t) == 4 || trans_width == 4))
+      || (BYTE_ORDER == BIG_ENDIAN && sizeof (time_t) == 8
+         && trans_width == 4))
     {
       /* Decode the transition times, stored as 4-byte integers in
         network (big-endian) byte order.  We work from the end of

diff --git a/timezone/zdump.c b/timezone/zdump.c
index b5dd09b..ae4d286 100644 (file)
--- a/timezone/zdump.c
+++ b/timezone/zdump.c
@@ -385,7 +385,7 @@ _("%s: usage is %s [ --version ] [ -v ] [ -c [loyear,]hiyear ] zonename ...\n"),
        }
        if (fflush(stdout) || ferror(stdout)) {
                (void) fprintf(stderr, "%s: ", progname);
-               (void) perror(_("Error writing standard output"));
+               (void) perror(_("Error writing to standard output"));
                exit(EXIT_FAILURE);
        }
        exit(EXIT_SUCCESS);
@@ -423,7 +423,7 @@ _("%s: use of -v on system with floating time_t other than float or double\n"),
                        t = t1;
                        t1 = 2 * t1 + 1;
                }
-                 
+
                absolute_max_time = t;
                t = -t;
                absolute_min_time = t - 1;