Update. cvs/libc-ud-970719

1997-07-19 22:53  Ulrich Drepper  <drepper@cygnus.com>

	* time/africa: Update from tzdata1997g.
	* time/asia: Likewise.
	* time/australia: Likewise.
	* time/europe: Likewise.
	* time/iso3166.tab: Likewise.
	* time/zone.tab: Likewise.
	* time/private.h: Update from tzcode1997f.
	* time/scheck.c: Likewise.

	* libio/stdio.h: Declare snprint and vsnprintf for __USE_ISOC9X.

	* math/math.h: Correct comments.  Include <bits/mathinline.h>
	always when optimizing.

1997-07-19 10:23  Mark Kettenis  <kettenis@phys.uva.nl>

	* time/getdate.c (__getdate_r):
	Report failure if string was not completely parsed.
	(getdate): Set getdate_err on failure.

1997-07-17  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* include/gnu-versions.h (_GNU_OBSTACK_INTERFACE_VERSION):
	Synchronize with malloc/obstack.c.

1997-07-16  Miles Bader  <miles@gnu.ai.mit.edu>

	* sysdeps/mach/hurd/mmap.c (__mmap): Check for !MAP_SHARED rather
	than MAP_COPY|MAP_PRIVATE, since those values are defined wierdly.
	Return EACCES rather than EGRATUITOUS if a R/W request isn't writable.

1997-07-15  Marcus G. Daniels  <marcus@cathcart.sysc.pdx.edu>

	* manual/Makefile (INSTALL_INFO): Introduce variable to override
	path to install-info for systems like Debian that have an
	install-info with a different command line interface from the
	canonical GNU texinfo version.

1997-07-15  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* sysdeps/posix/ttyname_r.c (__ttyname_r): Correct comment.
	* posix/unistd.h: Likewise.
	* sysdeps/stub/ttyname_r.c: Likewise.

	* sysdeps/unix/sysv/linux/sys/syscall.h: Pretty print.

21 files changed, 166 insertions, 88 deletions

diff --git a/ChangeLog b/ChangeLog
index 13e181e7e4..a446cc5391 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,49 @@
+1997-07-19 22:53  Ulrich Drepper  <drepper@cygnus.com>
+
+	* time/africa: Update from tzdata1997g.
+	* time/asia: Likewise.
+	* time/australia: Likewise.
+	* time/europe: Likewise.
+	* time/iso3166.tab: Likewise.
+	* time/zone.tab: Likewise.
+	* time/private.h: Update from tzcode1997f.
+	* time/scheck.c: Likewise.
+
+	* libio/stdio.h: Declare snprint and vsnprintf for __USE_ISOC9X.
+
+	* math/math.h: Correct comments.  Include <bits/mathinline.h>
+	always when optimizing.
+
+1997-07-19 10:23  Mark Kettenis  <kettenis@phys.uva.nl>
+
+	* time/getdate.c (__getdate_r):
+	Report failure if string was not completely parsed.
+	(getdate): Set getdate_err on failure.
+
+1997-07-17  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* include/gnu-versions.h (_GNU_OBSTACK_INTERFACE_VERSION):
+	Synchronize with malloc/obstack.c.
+
+1997-07-16  Miles Bader  <miles@gnu.ai.mit.edu>
+
+	* sysdeps/mach/hurd/mmap.c (__mmap): Check for !MAP_SHARED rather
+	than MAP_COPY|MAP_PRIVATE, since those values are defined wierdly.
+	Return EACCES rather than EGRATUITOUS if a R/W request isn't writable.
+
+1997-07-15  Marcus G. Daniels  <marcus@cathcart.sysc.pdx.edu>
+
+	* manual/Makefile (INSTALL_INFO): Introduce variable to override
+	path to install-info for systems like Debian that have an
+	install-info with a different command line interface from the
+	canonical GNU texinfo version.
+
+1997-07-15  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+	* sysdeps/posix/ttyname_r.c (__ttyname_r): Correct comment.
+	* posix/unistd.h: Likewise.
+	* sysdeps/stub/ttyname_r.c: Likewise.
+
 1997-07-14 23:37  Ulrich Drepper  <drepper@cygnus.com>
 
 	* inet/getnameinfo.c: Pretty print.
@@ -28,7 +74,7 @@
 
 	* sysdeps/unix/sysv/linux/Makefile: Make sure bits/syscall.h is
 	installed.
-	* sysdeps/unix/sysv/linux/sys/syscal.h: Pretty print.
+	* sysdeps/unix/sysv/linux/sys/syscall.h: Pretty print.
 
 1997-07-14 00:25  Ulrich Drepper  <drepper@cygnus.com>
 
diff --git a/config.guess b/config.guess
index 1a1d31f557..da4358892b 100755
--- a/config.guess
+++ b/config.guess
@@ -91,6 +91,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
+    arm32:NetBSD:*:*)
+	echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	exit 0 ;;
     SR2?01:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
 	exit 0;;
@@ -549,6 +552,11 @@ EOF
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
 	exit 0 ;;
+    pc:*:*:*)
+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+        # the processor, so we play safe by assuming i386.
+	echo i386-pc-msdosdjgpp
+        exit 0 ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit 0 ;;
diff --git a/include/gnu-versions.h b/include/gnu-versions.h
index 7085895a0a..f27e34fc29 100644
--- a/include/gnu-versions.h
+++ b/include/gnu-versions.h
@@ -44,7 +44,7 @@
    remember, if any of these versions change, the libc.so major version
    number must change too (so avoid it)!  */
 
-#define _GNU_OBSTACK_INTERFACE_VERSION	2 /* vs malloc/obstack.c */
+#define _GNU_OBSTACK_INTERFACE_VERSION	1 /* vs malloc/obstack.c */
 #define _GNU_REGEX_INTERFACE_VERSION	1 /* vs posix/regex.c */
 #define _GNU_GLOB_INTERFACE_VERSION	1 /* vs posix/glob.c */
 #define _GNU_GETOPT_INTERFACE_VERSION	2 /* vs posix/getopt.c and
diff --git a/libio/stdio.h b/libio/stdio.h
index a85062d5c2..24e0fa99ba 100644
--- a/libio/stdio.h
+++ b/libio/stdio.h
@@ -242,7 +242,7 @@ vprintf (const char *__restrict __fmt, _G_va_list __arg)
 }
 #endif /* Optimizing.  */
 
-#ifdef	__USE_GNU
+#if defined __USE_GNU || defined __USE_ISOC9X
 /* Maximum chars of output to write in MAXLEN.  */
 extern int __snprintf __P ((char *__s, size_t __maxlen,
 			    __const char *__format, ...));
@@ -253,7 +253,9 @@ extern int __vsnprintf __P ((char *__s, size_t __maxlen,
 			     __const char *__format, _G_va_list __arg));
 extern int vsnprintf __P ((char *__s, size_t __maxlen,
 			   __const char *__format, _G_va_list __arg));
+#endif
 
+#ifdef __USE_GNU
 /* Write formatted output to a string dynamically allocated with `malloc'.
    Store the address of the string in *PTR.  */
 extern int vasprintf __P ((char **__ptr, __const char *__f,
diff --git a/manual/Makefile b/manual/Makefile
index 836229356e..9359bad6cb 100644
--- a/manual/Makefile
+++ b/manual/Makefile
@@ -23,6 +23,8 @@ export subdir := $(subdir)
 
 # We need GNU awk for the xtract-typefun script.
 GAWK = gawk
+# Allow override
+INSTALL_INFO = install-info
 
 .PHONY: all dvi info
 all: dvi info
@@ -142,10 +144,10 @@ realclean: distclean
 .PHONY: install subdir_install installdirs install-data
 install-data subdir_install: install
 install: $(inst_infodir)/libc.info dir-add.info
-	@if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+	@if $(SHELL) -c '$(INSTALL_INFO) --version' >/dev/null 2>&1; then \
 	  test -f $(inst_infodir)/dir || cp dir $(inst_infodir);\
-	  install-info --info-dir=$(inst_infodir) $(inst_infodir)/libc.info;\
-	  install-info --info-dir=$(inst_infodir) dir-add.info;\
+	 $(INSTALL_INFO) --info-dir=$(inst_infodir) $(inst_infodir)/libc.info;\
+	 $(INSTALL_INFO) --info-dir=$(inst_infodir) dir-add.info;\
 	else : ; fi
 # Catchall implicit rule for other installation targets from the parent.
 install-%: ;
diff --git a/manual/texinfo.tex b/manual/texinfo.tex
index ad5db9cac6..fd306fa290 100644
--- a/manual/texinfo.tex
+++ b/manual/texinfo.tex
@@ -1,5 +1,5 @@
 %% TeX macros to handle Texinfo files.
-%% $Id: texinfo.tex,v 2.209 1997/07/13 12:07:01 drepper Exp $
+%% $Id: texinfo.tex,v 2.210 1997/07/15 19:22:46 drepper Exp $
 
 %  Copyright (C) 1985, 86, 88, 90, 91, 92, 93,
 %                94, 95, 96, 97 Free Software Foundation, Inc.
@@ -36,7 +36,7 @@
 
 % This automatically updates the version number based on RCS.
 \def\deftexinfoversion$#1: #2 ${\def\texinfoversion{#2}}
-\deftexinfoversion$Revision: 2.209 $
+\deftexinfoversion$Revision: 2.210 $
 \message{Loading texinfo package [Version \texinfoversion]:}
 
 % If in a .fmt file, print the version number
@@ -2334,6 +2334,7 @@ width0pt\relax} \fi
 \def\kbd##1{\realbackslash kbd {##1}}%
 \def\dfn##1{\realbackslash dfn {##1}}%
 \def\emph##1{\realbackslash emph {##1}}%
+\def\value##1{\realbackslash value {##1}}%
 \unsepspaces
 }
 
diff --git a/math/math.h b/math/math.h
index 713b3d5416..f1f8260c6c 100644
--- a/math/math.h
+++ b/math/math.h
@@ -298,8 +298,7 @@ extern int matherr __P ((struct exception *__exc));
 
 
 /* Get machine-dependent inline versions (if there are any).  */
-#if (!defined __NO_MATH_INLINES && defined __OPTIMIZE__) \
-    || defined __LIBC_M81_MATH_INLINES
+#ifdef __OPTIMIZE__
 # include <bits/mathinline.h>
 #endif
 
@@ -307,8 +306,9 @@ extern int matherr __P ((struct exception *__exc));
 #if __USE_ISOC9X
 /* ISO C 9X defines some macros to compare number while taking care
    for unordered numbers.  Since many FPUs provide special
-   instructions to support these and these tests are defined in
-   <bits/mathinline.h>, we define the macros at this late point.  */
+   instructions to support these operations and these tests are
+   defined in <bits/mathinline.h>, we define the generic macros at
+   this late point.  */
 
 /* Return nonzero value if X is greater than Y.  */
 # ifndef isgreater
diff --git a/posix/unistd.h b/posix/unistd.h
index 8593b03349..69371001c6 100644
--- a/posix/unistd.h
+++ b/posix/unistd.h
@@ -565,7 +565,7 @@ extern __pid_t vfork __P ((void));
 extern char *ttyname __P ((int __fd));
 
 /* Store at most BUFLEN characters of the pathname of the terminal FD is
-   open on in BUF.  Return 0 on success, -1 otherwise.  */
+   open on in BUF.  Return 0 on success, otherwise an error number.  */
 extern int __ttyname_r __P ((int __fd, char *__buf, size_t __buflen));
 extern int ttyname_r __P ((int __fd, char *__buf, size_t __buflen));
 
diff --git a/sysdeps/mach/hurd/mmap.c b/sysdeps/mach/hurd/mmap.c
index 0a804b96bc..dc4b024bb8 100644
--- a/sysdeps/mach/hurd/mmap.c
+++ b/sysdeps/mach/hurd/mmap.c
@@ -98,7 +98,7 @@ __mmap (caddr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
 		__mach_port_deallocate (__mach_task_self (), memobj);
 	      }
 	    else if (wobj == MACH_PORT_NULL && /* Not writable by mapping.  */
-		     (flags & (MAP_COPY|MAP_PRIVATE)))
+		     !(flags & MAP_SHARED))
 	      /* The file can only be mapped for reading.  Since we are
 		 making a private mapping, we will never try to write the
 		 object anyway, so we don't care.  */
@@ -106,8 +106,7 @@ __mmap (caddr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
 	    else
 	      {
 		__mach_port_deallocate (__mach_task_self (), wobj);
-		return ((caddr_t) (long int)
-			__hurd_fail (EGRATUITOUS)); /* XXX */
+		return (caddr_t) (long int) __hurd_fail (EACCES);
 	      }
 	    break;
 	  }
diff --git a/sysdeps/posix/ttyname_r.c b/sysdeps/posix/ttyname_r.c
index d404245be5..b3a15d13d1 100644
--- a/sysdeps/posix/ttyname_r.c
+++ b/sysdeps/posix/ttyname_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 93, 95, 96 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 93, 95, 96, 97 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
@@ -31,7 +31,7 @@
 #endif
 
 /* Store at most BUFLEN character of the pathname of the terminal FD is
-   open on in BUF.  Return 0 on success, -1 otherwise.  */
+   open on in BUF.  Return 0 on success,  otherwise an error number.  */
 int
 __ttyname_r (fd, buf, buflen)
      int fd;
diff --git a/sysdeps/stub/ttyname_r.c b/sysdeps/stub/ttyname_r.c
index 813fd03809..6599d60b8b 100644
--- a/sysdeps/stub/ttyname_r.c
+++ b/sysdeps/stub/ttyname_r.c
@@ -21,7 +21,7 @@
 
 
 /* Store at most BUFLEN characters the pathname of the terminal FD is
-   open on in BUF.  Return 0 on success, -1 otherwise.  */
+   open on in BUF.  Return 0 on success,  otherwise an error number.  */
 int
 ttyname_r (fd, buf, buflen)
      int fd;
@@ -29,7 +29,7 @@ ttyname_r (fd, buf, buflen)
      size_t buflen;
 {
   __set_errno (ENOSYS);
-  return -1;
+  return ENOSYS;
 }
 
 
diff --git a/time/README b/time/README
index 99d14db152..c15f4f6f63 100644
--- a/time/README
+++ b/time/README
@@ -3,7 +3,7 @@ The source files
 	`zdump.c'
 	`tzselect.ksh'
 	`checktab.awk'
-come from the tzcode1997a package by Arthur David Olsen et.al.
+come from the tzcode1997f package by Arthur David Olsen et.al.
 
 The files
 	`africa'
@@ -25,4 +25,4 @@ The files
 	`zone.tab'
 	`leapseconds'
 	`yearistype'
-come from the tzdata1997a package by Arthur David Olsen et.al.
+come from the tzdata1997g package by Arthur David Olsen et.al.
diff --git a/time/africa b/time/africa
index 1ac3835056..2ea89bd5e0 100644
--- a/time/africa
+++ b/time/africa
@@ -1,4 +1,4 @@
-# @(#)africa	7.17
+# @(#)africa	7.18
 
 # 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
@@ -218,7 +218,14 @@ Zone	Africa/Ndjamena	1:00:12 -	LMT	1912
 Zone	Indian/Comoro	2:53:04 -	LMT	1911 Jul   # Moroni, Gran Comoro
 			3:00	-	EAT
 
-# Congo
+# Democratic Republic of Congo
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone Africa/Kinshasa	1:01:12 -	LMT	1897 Nov 9
+			1:00	-	CAT
+Zone Africa/Lubumbashi	1:49:52 -	LMT	1897 Nov 9
+			2:00	-	SAT
+
+# Republic of the Congo
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Brazzaville	1:01:08 -	LMT	1912
 			1:00	-	CAT
@@ -656,13 +663,6 @@ Zone	Africa/Kampala	2:09:40 -	LMT	1928 Jul
 			2:45	-	BEAT	1957
 			3:00	-	EAT
 
-# Zaire
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Africa/Kinshasa	1:01:12 -	LMT	1897 Nov 9
-			1:00	-	CAT
-Zone Africa/Lubumbashi	1:49:52 -	LMT	1897 Nov 9
-			2:00	-	SAT
-
 # Zambia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Lusaka	1:53:08 -	LMT	1903 Mar
diff --git a/time/asia b/time/asia
index 829d40b9a8..6734749179 100644
--- a/time/asia
+++ b/time/asia
@@ -1,4 +1,4 @@
-# @(#)asia	7.29
+# @(#)asia	7.30
 
 # 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
@@ -214,28 +214,6 @@ Zone	Asia/Kashgar	5:03:56	-	LMT	1928
 			5:30	-	KAST	1940	 # Kashgar Time
 			5:00	-	KAST	1980 May
 			8:00	PRC	C%sT
-
-###############################################################################
-
-# Republic of China
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Taiwan	1945	1951	-	May	1	0:00	1:00	D
-Rule	Taiwan	1945	1951	-	Oct	1	0:00	0	S
-Rule	Taiwan	1952	only	-	Mar	1	0:00	1:00	D
-Rule	Taiwan	1952	1954	-	Nov	1	0:00	0	S
-Rule	Taiwan	1953	1959	-	Apr	1	0:00	1:00	D
-Rule	Taiwan	1955	1961	-	Oct	1	0:00	0	S
-Rule	Taiwan	1960	1961	-	Jun	1	0:00	1:00	D
-Rule	Taiwan	1974	1975	-	Apr	1	0:00	1:00	D
-Rule	Taiwan	1974	1975	-	Oct	1	0:00	0	S
-Rule	Taiwan	1980	only	-	Jun	30	0:00	1:00	D
-Rule	Taiwan	1980	only	-	Sep	30	0:00	0	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Taipei	8:06:00 -	LMT	1896
-			8:00	Taiwan	C%sT
-
-###############################################################################
 # Hong Kong
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	HK	1946	only	-	Apr	20	3:30	1:00	S
@@ -258,6 +236,27 @@ Zone	Asia/Hong_Kong	7:36:36 -	LMT	1904 Oct 30
 			8:00	HK	HK%sT	1997 Jul  1 # return to China
 			8:00	PRC	C%sT
 
+
+###############################################################################
+
+# Republic of China
+
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+Rule	Taiwan	1945	1951	-	May	1	0:00	1:00	D
+Rule	Taiwan	1945	1951	-	Oct	1	0:00	0	S
+Rule	Taiwan	1952	only	-	Mar	1	0:00	1:00	D
+Rule	Taiwan	1952	1954	-	Nov	1	0:00	0	S
+Rule	Taiwan	1953	1959	-	Apr	1	0:00	1:00	D
+Rule	Taiwan	1955	1961	-	Oct	1	0:00	0	S
+Rule	Taiwan	1960	1961	-	Jun	1	0:00	1:00	D
+Rule	Taiwan	1974	1975	-	Apr	1	0:00	1:00	D
+Rule	Taiwan	1974	1975	-	Oct	1	0:00	0	S
+Rule	Taiwan	1980	only	-	Jun	30	0:00	1:00	D
+Rule	Taiwan	1980	only	-	Sep	30	0:00	0	S
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone	Asia/Taipei	8:06:00 -	LMT	1896
+			8:00	Taiwan	C%sT
+
 # Macao
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Macao	1961	1962	-	Mar	Sun>=16	3:30	1:00	S
diff --git a/time/australasia b/time/australasia
index 11b0045a98..d981a6a916 100644
--- a/time/australasia
+++ b/time/australasia
@@ -1,4 +1,4 @@
-# @(#)australasia	7.33
+# @(#)australasia	7.34
 # This file also includes Pacific islands.
 
 # Notes are at the end of this file
@@ -768,6 +768,12 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # Prem Bob Carr announced NSW will fall into line with other E states
 # and SA and continue daylight savings to the last Sun in Mar.
 
+# From Eric Ulevik <eau@ozemail.com.au> (1997-06-12):
+# The NSW state government in Australia is talking about bringing the start
+# of daylight savings time forward in the year 2000 to cater for the Olympics.
+# This is going to take some time to be negotiated, because the plan is to do
+# this in multiple states due to soccer games (which are not just in Sydney).
+
 # Yancowinna
 
 # From John Basser (1989-01-04):
diff --git a/time/europe b/time/europe
index 6611520e98..c011424bdc 100644
--- a/time/europe
+++ b/time/europe
@@ -1,4 +1,4 @@
-# @(#)europe	7.44
+# @(#)europe	7.45
 
 # 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
@@ -829,7 +829,6 @@ Rule	C-Eur	1916	only	-	Oct	 1	 1:00	0	-
 Rule	C-Eur	1917	1918	-	Apr	Mon>=15	 2:00s	1:00	S
 Rule	C-Eur	1917	1918	-	Sep	Mon>=15	 2:00s	0	-
 Rule	C-Eur	1940	only	-	Apr	 1	 2:00s	1:00	S
-# Whitman says 1941 DST was only from Feb 25 to Oct 5; go with Shanks.
 Rule	C-Eur	1942	only	-	Nov	 2	 2:00s	0	-
 Rule	C-Eur	1943	only	-	Mar	29	 2:00s	1:00	S
 Rule	C-Eur	1943	only	-	Oct	 4	 2:00s	0	-
@@ -938,12 +937,11 @@ Rule	Albania	1982	only	-	Oct	 3	0:00	0	-
 Rule	Albania	1983	only	-	Apr	18	0:00	1:00	S
 Rule	Albania	1983	only	-	Oct	 1	0:00	0	-
 Rule	Albania	1984	only	-	Apr	 1	0:00	1:00	S
-Rule	Albania	1984	only	-	Oct	 1	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Tirane	1:19:20 -	LMT	1914
 			1:00	-	CET	1940 Jun 16
-			1:00	Albania	CE%sT	1985 Mar 31 1:00
-			1:00	W-Eur	CE%sT	1991
+# The following transition is from Shanks's 4th edition (1995).
+			1:00	Albania	CE%sT	1984 Jul
 			1:00	EU	CE%sT
 
 # Andorra
@@ -984,50 +982,62 @@ Zone	Europe/Minsk	1:50:16 -	LMT	1880
 			2:00	Russia	EE%sT
 
 # Belgium
-# Whitman and Shanks disagree; go with Shanks, usually.
+#
+# From Paul Eggert (1997-07-02):
+# Entries from 1918 through 1991 are taken from:
+#	Annuaire de L'Observatoire Royal de Belgique,
+#	Avenue Circulaire, 3, B-1180 BRUXELLES, CLVIIe annee, 1991
+#	(Imprimerie HAYEZ, s.p.r.l., Rue Fin, 4, 1080 BRUXELLES, MCMXC),
+#	pp 8-9.
+# LMT before 1892 was 0:17:30, according to the official journal of Belgium:
+#	Moniteur Belge, Samedi 30 Avril 1892, N.121.
+# Thanks to Pascal Delmoitie <pascal@belnet.be> for these references.
+# The 1918 rules are listed for completeness; they apply to unoccupied Belgium.
+# Assume Brussels switched to WET in 1918 when the armistice took effect.
+# 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-# From Whitman:
+Rule	Belgium	1918	only	-	Mar	 9	 0:00s	1:00	S
+Rule	Belgium	1918	1919	-	Oct	Sat>=1	23:00s	0	-
 Rule	Belgium	1919	only	-	Mar	 1	23:00s	1:00	S
-Rule	Belgium	1919	only	-	Oct	 4	23:00s	0	-
-# Shanks gives 1920 Feb 14 23:00s; go with Whitman.
-Rule	Belgium	1920	1921	-	Mar	14	23:00s	1:00	S
+Rule	Belgium	1920	only	-	Feb	14	23:00s	1:00	S
 Rule	Belgium	1920	only	-	Oct	23	23:00s	0	-
+Rule	Belgium	1921	only	-	Mar	14	23:00s	1:00	S
 Rule	Belgium	1921	only	-	Oct	25	23:00s	0	-
 Rule	Belgium	1922	only	-	Mar	25	23:00s	1:00	S
-# Whitman gives 1927 Oct 1 2:00s and 1928 Oct 7 2:00s; go with Shanks.
-Rule	Belgium	1922	1928	-	Oct	Sat>=1	23:00s	0	-
+Rule	Belgium	1922	1927	-	Oct	Sat>=1	23:00s	0	-
 Rule	Belgium	1923	only	-	Apr	21	23:00s	1:00	S
 Rule	Belgium	1924	only	-	Mar	29	23:00s	1:00	S
 Rule	Belgium	1925	only	-	Apr	 4	23:00s	1:00	S
 Rule	Belgium	1926	only	-	Apr	17	23:00s	1:00	S
 Rule	Belgium	1927	only	-	Apr	 9	23:00s	1:00	S
 Rule	Belgium	1928	only	-	Apr	14	23:00s	1:00	S
+Rule	Belgium	1928	1938	-	Oct	Sun>=2	 2:00s	0	-
 Rule	Belgium	1929	only	-	Apr	21	 2:00s	1:00	S
-Rule	Belgium	1929	1938	-	Oct	Sun>=2	 2:00s	0	-
 Rule	Belgium	1930	only	-	Apr	13	 2:00s	1:00	S
 Rule	Belgium	1931	only	-	Apr	19	 2:00s	1:00	S
-Rule	Belgium	1932	only	-	Apr	17	 2:00s	1:00	S
+Rule	Belgium	1932	only	-	Apr	 3	 2:00s	1:00	S
 Rule	Belgium	1933	only	-	Mar	26	 2:00s	1:00	S
 Rule	Belgium	1934	only	-	Apr	 8	 2:00s	1:00	S
 Rule	Belgium	1935	only	-	Mar	31	 2:00s	1:00	S
 Rule	Belgium	1936	only	-	Apr	19	 2:00s	1:00	S
-# Whitman says 1937 Apr 18 2:00s; go with Shanks.
 Rule	Belgium	1937	only	-	Apr	 4	 2:00s	1:00	S
-# Whitman says 1938 Apr 10 2:00s; go with Shanks.
 Rule	Belgium	1938	only	-	Mar	27	 2:00s	1:00	S
 Rule	Belgium	1939	only	-	Apr	16	 2:00s	1:00	S
 Rule	Belgium	1939	only	-	Nov	19	 2:00s	0	-
+Rule	Belgium	1940	only	-	Feb	25	 2:00s	1:00	S
+Rule	Belgium	1944	only	-	Sep	17	 2:00s	0	-
 Rule	Belgium	1945	only	-	Apr	 2	 2:00s	1:00	S
 Rule	Belgium	1945	only	-	Sep	16	 2:00s	0	-
 Rule	Belgium	1946	only	-	May	19	 2:00s	1:00	S
 Rule	Belgium	1946	only	-	Oct	 7	 2:00s	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Brussels	0:17:20 -	LMT	1880
-			0:17:20	-	BMT	1892 May  1 12:00 # Brussels MT
-			0:00	-	WET	1914 Aug  4
-			1:00	C-Eur	CE%sT	1919 Mar  1 23:00
-			0:00	Belgium	WE%sT	1940 Feb 24 23:00
-			1:00	C-Eur	CE%sT	1945 Apr  2  2:00
+Zone	Europe/Brussels	0:17:30 -	LMT	1880
+			0:17:30	-	BMT	1892 May  1 12:00 # Brussels MT
+			0:00	-	WET	1914 Nov  8
+			1:00	-	CET	1916 May  1  0:00
+			1:00	C-Eur	CE%sT	1918 Nov 11 11:00u
+			0:00	Belgium	WE%sT	1940 May 20  2:00s
+			1:00	C-Eur	CE%sT	1944 Sep  3
 			1:00	Belgium	CE%sT	1977
 			1:00	EU	CE%sT
 
diff --git a/time/getdate.c b/time/getdate.c
index a3153a9591..524abde038 100644
--- a/time/getdate.c
+++ b/time/getdate.c
@@ -160,7 +160,7 @@ __getdate_r (const char *string, struct tm *tp)
   /* Close template file.  */
   fclose (fp);
 
-  if (result == NULL)
+  if (result == NULL || *result != '\0')
     return 7;
 
   /* Get current time.  */
@@ -243,5 +243,11 @@ getdate (const char *string)
   static struct tm tmbuf;
   int errval = __getdate_r (string, &tmbuf);
 
-  return errval == 0 ? &tmbuf : NULL;
+  if (errval != 0)
+    {
+      getdate_err = errval;
+      return NULL;
+    }
+
+  return &tmbuf;
 }
diff --git a/time/iso3166.tab b/time/iso3166.tab
index 3daf4abb8d..b5237783c4 100644
--- a/time/iso3166.tab
+++ b/time/iso3166.tab
@@ -51,8 +51,9 @@ BY	Belarus
 BZ	Belize
 CA	Canada
 CC	Cocos (Keeling) Islands
+CD	Congo (Dem. Rep.)
 CF	Central African Rep.
-CG	Congo
+CG	Congo (Rep.)
 CH	Switzerland
 CI	Cote d'Ivoire
 CK	Cook Islands
@@ -103,7 +104,6 @@ GT	Guatemala
 GU	Guam
 GW	Guinea-Bissau
 GY	Guyana
-HK	Hong Kong
 HM	Heard Island & McDonald Islands
 HN	Honduras
 HR	Croatia
@@ -250,5 +250,4 @@ YT	Mayotte
 YU	Yugoslavia
 ZA	South Africa
 ZM	Zambia
-ZR	Zaire
 ZW	Zimbabwe
diff --git a/time/private.h b/time/private.h
index e32653b76d..7f98a67391 100644
--- a/time/private.h
+++ b/time/private.h
@@ -21,7 +21,7 @@
 
 #ifndef lint
 #ifndef NOID
-static char	privatehid[] = "@(#)private.h	7.45";
+static char	privatehid[] = "@(#)private.h	7.46";
 #endif /* !defined NOID */
 #endif /* !defined lint */
 
@@ -182,7 +182,7 @@ char *	imalloc P((int n));
 void *	irealloc P((void * pointer, int size));
 void	icfree P((char * pointer));
 void	ifree P((char * pointer));
-char *  scheck P((const char *string, const char *format));
+char *	scheck P((const char *string, const char *format));
 
 
 /*
diff --git a/time/scheck.c b/time/scheck.c
index 52b4ff51fd..39feeba701 100644
--- a/time/scheck.c
+++ b/time/scheck.c
@@ -1,6 +1,6 @@
 #ifndef lint
 #ifndef NOID
-static char	elsieid[] = "@(#)scheck.c	8.14";
+static char	elsieid[] = "@(#)scheck.c	8.15";
 #endif /* !defined lint */
 #endif /* !defined NOID */
 
diff --git a/time/zone.tab b/time/zone.tab
index 074749916a..48b32373cc 100644
--- a/time/zone.tab
+++ b/time/zone.tab
@@ -101,6 +101,8 @@ CA	+4916-12307	America/Vancouver	Pacific Time - west British Columbia
 CA	+6043-13503	America/Whitehorse	Pacific Time - south Yukon
 CA	+6404-13925	America/Dawson	Pacific Time - north Yukon
 CC	-1210+09655	Indian/Cocos
+CD	-0418+01518	Africa/Kinshasa	west Dem. Rep. of Congo
+CD	-1140+02728	Africa/Lubumbashi	east Dem. Rep. of Congo
 CF	+0422+01835	Africa/Bangui
 CG	-0416+01517	Africa/Brazzaville
 CH	+4723+00832	Europe/Zurich
@@ -111,6 +113,7 @@ CL	-2710-10927	Pacific/Easter	Easter Island
 CM	+0403+00942	Africa/Douala
 CN	+4545+12641	Asia/Harbin	north Manchuria
 CN	+3114+12128	Asia/Shanghai	China coast
+CN	+2217+11409	Asia/Hong_Kong	Hong Kong
 CN	+2934+10635	Asia/Chungking	China mountains
 CN	+4348+08735	Asia/Urumqi	Tibet & Xinjiang
 CN	+3929+07559	Asia/Kashgar	Eastern Turkestan
@@ -167,7 +170,6 @@ GT	+1438-09031	America/Guatemala
 GU	+1328+14445	Pacific/Guam
 GW	+1151-01535	Africa/Bissau
 GY	+0648-05810	America/Guyana
-HK	+2217+11409	Asia/Hong_Kong
 HN	+1406-08713	America/Tegucigalpa
 HR	+4548+01558	Europe/Zagreb
 HT	+1832-07220	America/Port-au-Prince
@@ -366,6 +368,4 @@ YT	-1247+04514	Indian/Mayotte
 YU	+4450+02030	Europe/Belgrade
 ZA	-2615+02800	Africa/Johannesburg
 ZM	-1525+02817	Africa/Lusaka
-ZR	-0418+01518	Africa/Kinshasa	west Zaire
-ZR	-1140+02728	Africa/Lubumbashi	east Zaire
 ZW	-1750+03103	Africa/Harare