about summary refs log tree commit diff
path: root/time/tzfile.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-03-20 00:38:50 +0000
committerUlrich Drepper <drepper@redhat.com>2004-03-20 00:38:50 +0000
commit4c326621751a856cac5327457c94216780d2c903 (patch)
tree224b7c3cecbe07ab0d0383532f8be31dcb4a3fdb /time/tzfile.c
parentde02bd0553bd50e457f351a1cc8d730b0e3990f9 (diff)
downloadglibc-4c326621751a856cac5327457c94216780d2c903.tar.gz
glibc-4c326621751a856cac5327457c94216780d2c903.tar.xz
glibc-4c326621751a856cac5327457c94216780d2c903.zip
Update.
2004-03-19  Ulrich Drepper  <drepper@redhat.com>

	* time/tzfile.c (__tzfile_default): Correct setting of rule_stdoff
	and rule_dstoff after reading the posixrules file.
Diffstat (limited to 'time/tzfile.c')
-rw-r--r--time/tzfile.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/time/tzfile.c b/time/tzfile.c
index e2d9f50cd9..2c178253e4 100644
--- a/time/tzfile.c
+++ b/time/tzfile.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1993, 1995-2001, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1993,1995-2001,2003,2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -424,6 +424,12 @@ __tzfile_default (const char *std, const char *dst,
       isdst = trans_type->isdst;
     }
 
+  /* Now that we adjusted the transitions to the requested offsets,
+     reset the rule_stdoff and rule_dstoff values appropriately.  They
+     are used elsewhere.  */
+  rule_stdoff = stdoff;
+  rule_dstoff = dstoff;
+
   /* Reset types 0 and 1 to describe the user's settings.  */
   types[0].idx = 0;
   types[0].offset = stdoff;