Update. cvs/libc-ud-971201

1997-12-01 17:27  Ulrich Drepper  <drepper@cygnus.com>

	* Makefile (subdirs): Add iconvdata and localedata.

	* iconv/gconv.h: Define UNKNOWN_10646_CHAR as error value.

	* iconv/gconv_conf.c (read_conf_file): Little optimization.

	* iconvdata/8bit-gap.c: New file.
	* iconvdata/8bit-generic.c: Renamed from ...
	* iconvdata/iso8859-generic.c: ...this.
	* iconvdata/configure: Removed.
	* iconvdata/Makefile: Add new modules and better rules.
	* iconvdata/iso6937.c: Minor bug fixes.
	* iconvdata/iso8859-1.c: Likewise.
	* iconvdata/t61.c: Likewise.
	* iconvdata/iso8859-2.c: Change to use 8bit-generic.c.
	Minor bug fixes.
	* iconvdata/iso8859-3.c: Likewise.
	* iconvdata/iso8859-4.c: Likewise.
	* iconvdata/iso8859-5.c: Likewise.
	* iconvdata/iso8859-6.c: Likewise.
	* iconvdata/iso8859-7.c: Likewise.
	* iconvdata/iso8859-8.c: Likewise.
	* iconvdata/iso8859-9.c: Likewise.
	* iconvdata/iso8859-10.c: Likewise.
	* iconvdata/ebcdic-at-de-a.c: New file.
	* iconvdata/ebcdic-at-de.c: New file.
	* iconvdata/ebcdic-ca-fr.c: New file.
	* iconvdata/hp-roman8.c: New file.
	* iconvdata/koi-8.c: New file.
	* iconvdata/koi8-r.c: New file.
	* iconvdata/koi8-h.c: New file.
	* iconvdata/latin-greek-1.c: New file.
	* iconvdata/latin-greek-1.h: New file.
	* iconvdata/latin-greek.c: New file.
	* iconvdata/latin-greek.h: New file.
	* iconvdata/jis0201.c: New file.
	* iconvdata/jis0201.h: New file.
	* iconvdata/jis0208.c: New file.
	* iconvdata/jis0208.h: New file.
	* iconvdata/jis0212.c: New file.
	* iconvdata/jis0212.h: New file.
	* iconvdata/sjis.c: New file.
	* iconvdata/gap.pl: New file.  Script to generate table header.
	* iconvdata/gaptab.pl: New file.
	* iconvdata/gconv-modules: Add info about new modules.

	* locale/programs/charmap.c: Also examine alias names given in charmap
	files.

	* localedata/*: Add to here from add-on.  We need the information
	to generate tables for iconv.

	Update from db-2.3.14.
	* db2/Makefile: Updated.
	* db2/config.h: Likewise.
	* db2/db.h: Likewise.
	* db2/db_int.h: Likewise.
	* db2/btree/bt_cursor.c: Likewise.
	* db2/btree/bt_delete.c: Likewise.
	* db2/btree/bt_put.c: Likewise.
	* db2/btree/bt_search.c: Likewise.
	* db2/btree/bt_split.c: Likewise.
	* db2/btree/btree_auto.c: Likewise.
	* db2/common/db_appinit.c: Likewise.
	* db2/common/db_apprec.c: Likewise.
	* db2/common/db_err.c: Likewise.
	* db2/common/db_region.c: Likewise.
	* db2/db/db_auto.c: Likewise.
	* db2/db/db_dispatch.c: Likewise.
	* db2/db/db_ret.c: Likewise.
	* db2/dbm/dbm.c: Likewise.
	* db2/hash/hash_auto.c: Likewise.
	* db2/include/btree_ext.h: Likewise.
	* db2/include/common_ext.h: Likewise.
	* db2/include/db.h.src: Likewise.
	* db2/include/db_cxx.h: Likewise.
	* db2/include/db_ext.h: Likewise.
	* db2/include/db_int.h.src: Likewise.
	* db2/include/lock.h: Likewise.
	* db2/include/log.h: Likewise.
	* db2/include/mp.h: Likewise.
	* db2/include/mp_ext.h: Likewise.
	* db2/include/os_ext.h: Likewise.
	* db2/include/os_func.h: Likewise.
	* db2/lock/lock.c: Likewise.
	* db2/lock/lock_deadlock.c: Likewise.
	* db2/log/log.c: Likewise.
	* db2/log/log_archive.c: Likewise.
	* db2/log/log_auto.c: Likewise.
	* db2/log/log_get.c: Likewise.
	* db2/log/log_put.c: Likewise.
	* db2/mp/mp_bh.c: Likewise.
	* db2/mp/mp_fget.c: Likewise.
	* db2/mp/mp_fopen.c: Likewise.
	* db2/mp/mp_fput.c: Likewise.
	* db2/mp/mp_fset.c: Likewise.
	* db2/mp/mp_open.c: Likewise.
	* db2/mp/mp_pr.c: Likewise.
	* db2/mp/mp_region.c: Likewise.
	* db2/mp/mp_sync.c: Likewise.
	* db2/mutex/README: Likewise.
	* db2/mutex/mutex.c: Likewise.
	* db2/os/os_open.c: Likewise.
	* db2/os/os_func.c: Removed.
	* db2/os/os_config.c: New file.
	* db2/os/os_spin.c: New file.
	* db2/txn/txn.c: Likewise.
	* db2/txn/txn_auto.c: Likewise.

1997-11-30 06:01  Ulrich Drepper  <drepper@cygnus.com>

	* posix/sys/wait.h (__WAIT_INT): Don't use complex version with
	__typeof for C++ since this fails for class members.
	Reported by Neal Becker <neal@ctd.comsat.com>.

1997-11-28 11:21  Zack Weinberg  <zack@rabi.phys.columbia.edu>

	* configure.in: Check for a working makeinfo (3.11 or better).
	* config.make.in: Add MAKEINFO to be substituted.
	* manual/Makefile: Don't update info if makeinfo is too old.

1997-11-30 05:21  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/alpha/setjmp.S: Define _ASM and _SETJMP_H to get definitions.
	* sysdeps/alpha/__longjmp.S: Likewise.
	* sysdeps/unix/sysv/linux/alpha/kernel_termios.h: Include <termios.h>
	not <bits/termios.h>.

	* sysdeps/unix/sysv/linux/alpha/syscalls.list: Define syscall as
	__llseek and make llseek and lseek64 weak aliases.
	* sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list: Likewise.
	Patches by a sun <asun@zoology.washington.edu>.

1997-11-29 19:19  Zack Weinberg  <zack@rabi.phys.columbia.edu>

	* misc/sys/syslog.h: Delete KERNEL preprocessor conditional.
	* sysdeps/unix/sysv/linux/powerpc/bits/termios.h: Likewise.
	* sysdeps/unix/sysv/linux/sparc/bits/termios.h: Likewise.
	* misc/sys/syslog.h: Clean up BSD header.

1997-11-29  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* sysdeps/unix/sysv/linux/bits/in.h: Add changes from Linux 2.1.67.

	* sysdeps/libm-ieee754/s_ctan.c (__ctan): Raise invalid exception
	for ctan(+-inf,x).
	* sysdeps/libm-ieee754/s_ctanl.c (__ctanl): Likewise.
	* sysdeps/libm-ieee754/s_ctanf.c (__ctanf): Likewise.

	* math/libm-test.c (csqrt_test): Add tests for cabs, carg, ctan,
	csqrt (-1), ctanh(i*pi/4).

1997-11-26  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/generic/bits/confname.h: Fix comma in enumerator.

1997-11-28 13:28  Philip Blundell  <Philip.Blundell@pobox.com>

	* sysdeps/unix/sysv/linux/net/if_arp.h: Add more ARPHRD_ constants.

1997-11-26  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* wcsmbs/wcrtomb.c (__wcrtomb): Remove unused variable fake.

1997-11-26 21:28  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/posix/getcwd.c (GETCWD_STORYGE_CLASS): Remove definition
	and use.  Define GETCWD_RETURN_TYPE instead and use it.
	* sysdeps/unix/sysv/linux/getcwd.c: Define GETCWD_RETURN_TYPE instead
	of GETCWD_STORYGE_CLASS and put the return type and the
	`internal_function' in the right order for gcc 2.7.2.

1997-11-26  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* sysdeps/unix/sysv/linux/sys/module.h: Remove file.  It's
	incompatible with Linux 2.1.x.  Packages using modules
	(e.g. modutils) should/do provide their own version.  Suggested by
	Richard Henderson.

	* sysdeps/unix/sysv/linux/Dist: Remove sys/module.h.

	* sysdeps/unix/sysv/linux/Makefile (sysdep_headers)
	[$(subdir)=socket]: Remove sys/module.h.

	* libio/stdio.h: Correct comment of sys_nerr/sys_errlist.

3 files changed, 167 insertions, 27 deletions

diff --git a/db2/os/os_func.c b/db2/os/os_config.c
index afd40f4624..ecb4f1c2e7 100644
--- a/db2/os/os_func.c
+++ b/db2/os/os_config.c
@@ -8,7 +8,7 @@
 #include "config.h"
 
 #ifndef lint
-static const char sccsid[] = "@(#)os_func.c	10.4 (Sleepycat) 10/28/97";
+static const char sccsid[] = "@(#)os_config.c	10.9 (Sleepycat) 11/28/97";
 #endif /* not lint */
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -31,7 +31,6 @@ static const char sccsid[] = "@(#)os_func.c	10.4 (Sleepycat) 10/28/97";
 #define imported
 #endif
 
-imported extern void    *calloc __P((size_t, size_t));
 imported extern int	 close __P((int));
 imported extern void	 free __P((void *));
 imported extern int	 fsync __P((int));
@@ -42,16 +41,16 @@ imported extern char	*strdup __P((const char *));
 imported extern void    *realloc __P((void *, size_t));
 imported extern int	 unlink __P((const char *));
 imported extern ssize_t	 write __P((int, const void *, size_t));
+imported extern void	*memset __P((void *, int, size_t));
 
 /*
  * __db_jump --
  *	This list of interfaces that applications can replace.  In some
  *	cases, the user is permitted to replace the standard ANSI C or
- *	POSIX 1003.1 call, e.g., calloc or read.  In others, we provide
+ *	POSIX 1003.1 call, e.g., malloc or read.  In others, we provide
  *	a local interface to the functionality, e.g., __os_map.
  */
 struct __db_jumptab __db_jump = {
-	calloc,				/* DB_FUNC_CALLOC */
 	close,				/* DB_FUNC_CLOSE */
 	__os_dirfree,			/* DB_FUNC_DIRFREE */
 	__os_dirlist,			/* DB_FUNC_DIRLIST */
@@ -73,9 +72,11 @@ struct __db_jumptab __db_jump = {
 	NULL				/* DB_FUNC_YIELD */
 };
 
+int __db_tsl_spins;			/* DB_TSL_SPINS */
+
 /*
  * db_jump_set --
- *	Replace an interface.
+ *	Replace functions for the DB package.
  */
 int
 db_jump_set(func, which)
@@ -84,70 +85,148 @@ db_jump_set(func, which)
 {
 	switch (which) {
 	case DB_FUNC_CALLOC:
-		__db_calloc = (void *(*) __P((size_t, size_t)))func;
-		break;
+		/*
+		 * XXX
+		 * Obsolete, calloc is no longer called by DB.
+		 */
+		 break;
 	case DB_FUNC_CLOSE:
-		__os_close = (int (*) __P((int)))func;
+		__db_jump.db_close = (int (*) __P((int)))func;
 		break;
 	case DB_FUNC_DIRFREE:
-		__db_dirfree = (void (*) __P((char **, int)))func;
+		__db_jump.db_dirfree = (void (*) __P((char **, int)))func;
 		break;
 	case DB_FUNC_DIRLIST:
-		__db_dirlist =
+		__db_jump.db_dirlist =
 		    (int (*) __P((const char *, char ***, int *)))func;
 		break;
 	case DB_FUNC_EXISTS:
-		__db_exists = (int (*) __P((const char *, int *)))func;
+		__db_jump.db_exists = (int (*) __P((const char *, int *)))func;
 		break;
 	case DB_FUNC_FREE:
-		__db_free = (void (*) __P((void *)))func;
+		__db_jump.db_free = (void (*) __P((void *)))func;
 		break;
 	case DB_FUNC_FSYNC:
-		__os_fsync = (int (*) __P((int)))func;
+		__db_jump.db_fsync = (int (*) __P((int)))func;
 		break;
 	case DB_FUNC_IOINFO:
-		__db_ioinfo =
+		__db_jump.db_ioinfo =
 		    (int (*) __P((const char *, int, off_t *, off_t *)))func;
 		break;
 	case DB_FUNC_MALLOC:
-		__db_malloc = (void *(*) __P((size_t)))func;
+		__db_jump.db_malloc = (void *(*) __P((size_t)))func;
 		break;
 	case DB_FUNC_MAP:
-		__db_map = (int (*) __P((int, size_t, int, int, void **)))func;
+		__db_jump.db_map =
+		    (int (*) __P((int, size_t, int, int, void **)))func;
 		break;
 	case DB_FUNC_OPEN:
-		__os_open = (int (*) __P((const char *, int, ...)))func;
+		__db_jump.db_open = (int (*) __P((const char *, int, ...)))func;
 		break;
 	case DB_FUNC_READ:
-		__os_read = (ssize_t (*) __P((int, void *, size_t)))func;
+		__db_jump.db_read =
+		    (ssize_t (*) __P((int, void *, size_t)))func;
 		break;
 	case DB_FUNC_REALLOC:
-		__db_realloc = (void *(*) __P((void *, size_t)))func;
+		__db_jump.db_realloc = (void *(*) __P((void *, size_t)))func;
 		break;
 	case DB_FUNC_SEEK:
-		__db_seek =
+		__db_jump.db_seek =
 		    (int (*) __P((int, size_t, db_pgno_t, u_long, int)))func;
 		break;
 	case DB_FUNC_SLEEP:
-		__db_sleep = (int (*) __P((u_long, u_long)))func;
+		__db_jump.db_sleep = (int (*) __P((u_long, u_long)))func;
 		break;
 	case DB_FUNC_STRDUP:
-		__db_strdup = (char *(*) __P((const char *)))func;
+		__db_jump.db_strdup = (char *(*) __P((const char *)))func;
 		break;
 	case DB_FUNC_UNLINK:
-		__os_unlink = (int (*) __P((const char *)))func;
+		__db_jump.db_unlink = (int (*) __P((const char *)))func;
 		break;
 	case DB_FUNC_UNMAP:
-		__db_unmap = (int (*) __P((void *, size_t)))func;
+		__db_jump.db_unmap = (int (*) __P((void *, size_t)))func;
 		break;
 	case DB_FUNC_WRITE:
-		__os_write = (ssize_t (*) __P((int, const void *, size_t)))func;
+		__db_jump.db_write =
+		    (ssize_t (*) __P((int, const void *, size_t)))func;
 		break;
 	case DB_FUNC_YIELD:
-		__db_yield = (int (*) __P((void)))func;
+		__db_jump.db_yield = (int (*) __P((void)))func;
+		break;
+	default:
+		return (EINVAL);
+	}
+	return (0);
+}
+
+/*
+ * db_value_set --
+ *	Replace values for the DB package.
+ */
+int
+db_value_set(value, which)
+	int value, which;
+{
+	switch (which) {
+	case DB_TSL_SPINS:
+		if (value <= 0)
+			return (EINVAL);
+		__db_tsl_spins = value;
 		break;
 	default:
 		return (EINVAL);
 	}
 	return (0);
 }
+
+/*
+ * XXX
+ * Correct for systems that return NULL when you allocate 0 bytes of memory.
+ * There are several places in DB where we allocate the number of bytes held
+ * by the key/data item, and it can be 0.  Correct here so that malloc never
+ * returns a NULL for that reason.
+ */
+/*
+ * __db_calloc --
+ *	The calloc(3) function for DB.
+ *
+ * PUBLIC: void *__db_calloc __P((size_t, size_t));
+ */
+void *
+__db_calloc(num, size)
+	size_t num, size;
+{
+	void *p;
+
+	size *= num;
+	if ((p = __db_jump.db_malloc(size == 0 ? 1 : size)) != NULL)
+		memset(p, 0, size);
+	return (p);
+}
+
+/*
+ * __db_malloc --
+ *	The malloc(3) function for DB.
+ *
+ * PUBLIC: void *__db_malloc __P((size_t));
+ */
+void *
+__db_malloc(size)
+	size_t size;
+{
+	return (__db_jump.db_malloc(size == 0 ? 1 : size));
+}
+
+/*
+ * __db_realloc --
+ *	The realloc(3) function for DB.
+ *
+ * PUBLIC: void *__db_realloc __P((void *, size_t));
+ */
+void *
+__db_realloc(ptr, size)
+	void *ptr;
+	size_t size;
+{
+	return (__db_jump.db_realloc(ptr, size == 0 ? 1 : size));
+}
diff --git a/db2/os/os_open.c b/db2/os/os_open.c
index 05784e4810..a628765556 100644
--- a/db2/os/os_open.c
+++ b/db2/os/os_open.c
@@ -8,7 +8,7 @@
 #include "config.h"
 
 #ifndef lint
-static const char sccsid[] = "@(#)os_open.c	10.19 (Sleepycat) 10/28/97";
+static const char sccsid[] = "@(#)os_open.c	10.20 (Sleepycat) 11/27/97";
 #endif /* not lint */
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -38,6 +38,11 @@ __db_open(name, arg_flags, ok_flags, mode, fdp)
 		return (EINVAL);
 
 	flags = 0;
+
+	/*
+	 * DB requires the semantic that two files opened at the same time
+	 * with O_CREAT and O_EXCL set will return failure in at least one.
+	 */
 	if (arg_flags & DB_CREATE)
 		flags |= O_CREAT;
 
diff --git a/db2/os/os_spin.c b/db2/os/os_spin.c
new file mode 100644
index 0000000000..fb693c2848
--- /dev/null
+++ b/db2/os/os_spin.c
@@ -0,0 +1,56 @@
+/*-
+ * See the file LICENSE for redistribution information.
+ *
+ * Copyright (c) 1997
+ *	Sleepycat Software.  All rights reserved.
+ */
+
+#include "config.h"
+
+#ifndef lint
+static const char sccsid[] = "@(#)os_spin.c	10.3 (Sleepycat) 11/25/97";
+#endif /* not lint */
+
+#ifndef NO_SYSTEM_INCLUDES
+#include <sys/types.h>
+
+#include <limits.h>
+#include <unistd.h>
+#endif
+
+#include "db_int.h"
+
+/*
+ * __os_spin --
+ *	Return the number of default spins before blocking.
+ *
+ * PUBLIC: int __os_spin __P((void));
+ */
+int
+__os_spin()
+{
+	extern int __db_tsl_spins;
+
+	/* If the application specified the spins, use its value. */
+	if (__db_tsl_spins != 0)
+		return (__db_tsl_spins);
+
+	/*
+	 * XXX
+	 * Sysconf: Solaris uses _SC_NPROCESSORS_ONLN to return the number
+	 * of online processors.  I don't know if this call is portable or
+	 * not.
+	 */
+#if defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_ONLN)
+	{
+		long sys_val;
+
+		sys_val = sysconf(_SC_NPROCESSORS_ONLN);
+		if (sys_val > 0)
+			return (sys_val * 50);
+	}
+#endif
+
+	/* Default to a single processor. */
+	return (1);
+}