Update.

1998-05-14 13:25  Ulrich Drepper  <drepper@cygnus.com>

	* inet/netinet/in.h: Add defines for multicast.
	Reported by Jeremy Hall <jhall@UU.NET>.

	* stdlib/stdlib.h: Add prototypes for __setenv and __unsetenv.
	* sysdeps/generic/putenv.c: Use __setenv and __unsetenv, not setenv
	and unsetenv.  Optimize _LIBC case.
	* sysdeps/generic/setenv.c: Prevent unnecessary memory leaks.
	Define functions with leading __.

	* time/tzfile.c: Correct handling of global variables daylight,
	timezone, and tzname.
	* time/tzset.c: Likewise.
	* timezone/Makefile (tests): Add tst-timezone.
	* timezone/tst-timezone.c: New file.

1998-05-14 10:35  Ulrich Drepper  <drepper@cygnus.com>

	* timezone/asia: Update from tzdata1998d.
	* timezone/australasia: Likewise.
	* timezone/europe: Likewise.

5 files changed, 113 insertions, 10 deletions

diff --git a/timezone/Makefile b/timezone/Makefile
index 9b436e1..1b26d1a 100644
--- a/timezone/Makefile
+++ b/timezone/Makefile
@@ -28,7 +28,7 @@ distribute := tzfile.h private.h scheck.c ialloc.c yearistype	\
 extra-objs := scheck.o ialloc.o
 
 others	:= zdump zic
-tests	:= test-tz
+tests	:= test-tz tst-timezone
 
 tzbases := africa antarctica asia australasia europe northamerica \
 	   southamerica etcetera factory systemv \
diff --git a/timezone/asia b/timezone/asia
index de1a379..8d667cc 100644
--- a/timezone/asia
+++ b/timezone/asia
@@ -1,4 +1,4 @@
-# @(#)asia	7.36
+# @(#)asia	7.38
 
 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
@@ -507,7 +507,7 @@ Rule	Zion	1988	only	-	Apr	 9	0:00	1:00	D
 Rule	Zion	1988	only	-	Sep	 3	0:00	0	S
 
 # From Ephraim Silverberg <ephraim@cs.huji.ac.il>
-# (1997-03-04 and 1997-12-31):
+# (1997-03-04 and 1998-03-16):
 
 # According to the Office of the Secretary General of the Ministry of
 # Interior, there is NO set rule for Daylight-Savings/Standard time changes.
@@ -557,9 +557,9 @@ Rule	Zion	1995	only	-	Sep	 3	0:00	0	S
 #
 #   ftp://ftp.huji.ac.il/pub/tz/announcements/1997.ps.gz
 #
-# According to the Office of the Spokeswoman for the Ministry of Interior,
-# the dates for 1998 are tentative and are still subject to final approval
-# (probably in late February/early March of 1998).
+# The official announcement for the year 1998 can be viewed at:
+#
+#   ftp://ftp.huji.ac.il/pub/tz/announcements/1998.ps.gz
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Zion	1996	only	-	Mar	15	0:00	1:00	D
@@ -780,7 +780,6 @@ Zone	Indian/Maldives	4:54:00 -	LMT	1880	# Male
 
 # Mongolia
 # Shanks says that Mongolia has three time zones, but usno1995 and the CIA map
-# <a href="http://www.odci.gov/cia/publications/nsolo/rmap-pdf/802483.pdf">
 # Standard Time Zones of the World (1997-01)
 # </a>
 # both say that it has just one.
diff --git a/timezone/australasia b/timezone/australasia
index 2bb3a0a..810c10d 100644
--- a/timezone/australasia
+++ b/timezone/australasia
@@ -1,4 +1,4 @@
-# @(#)australasia	7.40
+# @(#)australasia	7.41
 # This file also includes Pacific islands.
 
 # Notes are at the end of this file
@@ -804,7 +804,7 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # # YANCOWINNA..  [ Confirmation courtesy of Broken Hill Postmaster ]
 # #					[ Dec 1990 ]
 # ...
-# # Yancowinna uses Central Standard Time, despite it's location on the
+# # Yancowinna uses Central Standard Time, despite [its] location on the
 # # New South Wales side of the S.A. border. Most business and social dealings
 # # are with CST zones, therefore CST is legislated by local government
 # # although the switch to Summer Time occurs in line with N.S.W. There have
diff --git a/timezone/europe b/timezone/europe
index 0df00f3..0f2398f 100644
--- a/timezone/europe
+++ b/timezone/europe
@@ -1,4 +1,4 @@
-# @(#)europe	7.53
+# %W%
 
 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
diff --git a/timezone/tst-timezone.c b/timezone/tst-timezone.c
new file mode 100644
index 0000000..49b3621
--- /dev/null
+++ b/timezone/tst-timezone.c
@@ -0,0 +1,104 @@
+/* Copyright (C) 1998 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Andreas Jaeger <aj@arthur.rhein-neckar.de>, 1998.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <time.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+int failed = 0;
+
+struct test_times
+{
+  const char *name;
+  int daylight;
+  int timezone;
+};
+
+static const struct test_times tests[] =
+{
+  { "Europe/Berlin", 1, -3600 },
+  { "Universal", 0, 0 },
+  { "Australia/Melbourne", 1, -36000 },
+  { "America/Sao_Paulo", 1, 10800 },
+  { NULL, 0, 0 }
+};
+
+
+void
+print_tzvars (void)
+{
+  printf ("tzname[0]: %s\n", tzname[0]);
+  printf ("tzname[1]: %s\n", tzname[1]);
+  printf ("daylight: %d\n", daylight);
+  printf ("timezone: %ld\n", timezone);
+}
+
+
+void
+check_tzvars (const char *name, int dayl, int timez)
+{
+  if (daylight != dayl)
+    {
+      printf ("Timezone: %s, daylight is: %d but should be: %d\n",
+	      name, daylight, dayl);
+      ++failed;
+    }
+  if (timezone != timez)
+    {
+      printf ("Timezone: %s, timezone is: %ld but should be: %d\n",
+	      name, timezone, timez);
+      ++failed;
+    }
+}
+
+
+int
+main (int argc, char ** argv)
+{
+  time_t t;
+  const struct test_times *pt;
+  char buf[BUFSIZ];
+
+  /* This should be: Thu May 14 18:02:16 1998.  */
+  t = 895194136;
+  printf ("We use this date: %s\n", ctime (&t));
+
+  for (pt = tests; pt->name != NULL; ++pt)
+    {
+      /* Start with a known state */
+      printf ("Checking timezone %s\n", pt->name);
+      sprintf (buf, "TZ=%s", pt->name);
+      if (putenv (buf))
+	{
+	  puts ("putenv failed.");
+	  failed = 1;
+	}
+      tzset ();
+      print_tzvars ();
+      check_tzvars (pt->name, pt->daylight, pt->timezone);
+
+      /* calling localtime shouldn't make a difference */
+      localtime (&t);
+      print_tzvars ();
+      check_tzvars (pt->name, pt->daylight, pt->timezone);
+    }
+
+  return failed ? EXIT_FAILURE : EXIT_SUCCESS;
+}