Update.

1998-06-09  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/netinet/ip.h (struct ip_options): Define
	__data member only for gcc.  Reported by ak@muc.de.

	* misc/mntent.h: Undo last patch.
	* sysdeps/unix/sysv/linux/fstatvfs.c (fstatvfs): Undo last patch.
	* misc/tst/mntent.c: Adjust code for this change.

	* io/fts.c: Updated from a slightly more recent BSD version.
	* io/fts.h: Likewise.

	* libc.map: Add __libc_stack_end.

	* db2/Makefile (routines): Add lock_region.
	* db2/config.h: Update from db-2.4.14.
	* db2/db.h: Likewise.
	* db2/db_185.h: Likewise.
	* db2/db_int.h: Likewise.
	* db2/bt_close.c: Likewise.
	* db2/bt_compare.c: Likewise.
	* db2/bt_conv.c: Likewise.
	* db2/bt_cursor.c: Likewise.
	* db2/bt_delete.c: Likewise.
	* db2/bt_open.c: Likewise.
	* db2/bt_page.c: Likewise.
	* db2/bt_put.c: Likewise.
	* db2/bt_rec.c: Likewise.
	* db2/bt_recno.c: Likewise.
	* db2/bt_rsearch.c: Likewise.
	* db2/bt_search.c: Likewise.
	* db2/bt_split.c: Likewise.
	* db2/bt_stat.c: Likewise.
	* db2/btree.src: Likewise.
	* db2/btree_auto.c: Likewise.
	* db2/getlong.c: Likewise.
	* db2/db_appinit.c: Likewise.
	* db2/db_apprec.c: Likewise.
	* db2/db_byteorder.c: Likewise.
	* db2/db_err.c: Likewise.
	* db2/db_log2.c: Likewise.
	* db2/db_region.c: Likewise.
	* db2/db_salloc.c: Likewise.
	* db2/db_shash.c: Likewise.
	* db2/db.c: Likewise.
	* db2/db.src: Likewise.
	* db2/db_auto.c: Likewise.
	* db2/db_conv.c: Likewise.
	* db2/db_dispatch.c: Likewise.
	* db2/db_dup.c: Likewise.
	* db2/db_overflow.c: Likewise.
	* db2/db_pr.c: Likewise.
	* db2/db_rec.c: Likewise.
	* db2/db_ret.c: Likewise.
	* db2/db_thread.c: Likewise.
	* db2/db185.c: Likewise.
	* db2/db185_int.h: Likewise.
	* db2/dbm.c: Likewise.
	* db2/hash.c: Likewise.
	* db2/hash.src: Likewise.
	* db2/hash_auto.c: Likewise.
	* db2/hash_conv.c: Likewise.
	* db2/hash_debug.c: Likewise.
	* db2/hash_dup.c: Likewise.
	* db2/hash_func.c: Likewise.
	* db2/hash_page.c: Likewise.
	* db2/hash_rec.c: Likewise.
	* db2/hash_stat.c: Likewise.
	* db2/btree.h: Likewise.
	* db2/btree_ext.h: Likewise.
	* db2/clib_ext.h: Likewise.
	* db2/common_ext.h: Likewise.
	* db2/cxx_int.h: Likewise.
	* db2/db.h.src: Likewise.
	* db2/db_185.h.src: Likewise.
	* db2/db_am.h: Likewise.
	* db2/db_auto.h: Likewise.
	* db2/db_cxx.h: Likewise.
	* db2/db_dispatch.h: Likewise.
	* db2/db_ext.h: Likewise.
	* db2/db_int.h.src: Likewise.
	* db2/db_page.h: Likewise.
	* db2/db_shash.h: Likewise.
	* db2/db_swap.h: Likewise.
	* db2/hash.h: Likewise.
	* db2/hash_ext.h: Likewise.
	* db2/lock.h: Likewise.
	* db2/lock_ext.h: Likewise.
	* db2/log.h: Likewise.
	* db2/log_ext.h: Likewise.
	* db2/mp.h: Likewise.
	* db2/mp_ext.h: Likewise.
	* db2/mutex_ext.h: Likewise.
	* db2/os_ext.h: Likewise.
	* db2/os_func.h: Likewise.
	* db2/queue.h: Likewise.
	* db2/shqueue.h: Likewise.
	* db2/txn.h: Likewise.
	* db2/lock.c: Likewise.
	* db2/lock_conflict.c: Likewise.
	* db2/lock_deadlock.c: Likewise.
	* db2/lock_region.c: Likewise.
	* db2/lock_util.c: Likewise.
	* db2/log.c: Likewise.
	* db2/log.src: Likewise.
	* db2/log_archive.c: Likewise.
	* db2/log_auto.c: Likewise.
	* db2/log_compare.c: Likewise.
	* db2/log_findckp.c: Likewise.
	* db2/log_get.c: Likewise.
	* db2/log_put.c: Likewise.
	* db2/log_rec.c: Likewise.
	* db2/log_register.c: Likewise.
	* db2/mp_bh.c: Likewise.
	* db2/mp_fget.c: Likewise.
	* db2/mp_fopen.c: Likewise.
	* db2/mp_fput.c: Likewise.
	* db2/mp_fset.c: Likewise.
	* db2/mp_open.c: Likewise.
	* db2/mp_pr.c: Likewise.
	* db2/mp_region.c: Likewise.
	* db2/mp_sync.c: Likewise.
	* db2/68020.gcc: Likewise.
	* db2/mutex.c: Likewise.
	* db2/parisc.gcc: Likewise.
	* db2/parisc.hp: Likewise.
	* db2/sco.cc: Likewise.
	* db2/os_abs.c: Likewise.
	* db2/os_alloc.c: Likewise.
	* db2/os_config.c: Likewise.
	* db2/os_dir.c: Likewise.
	* db2/os_fid.c: Likewise.
	* db2/os_fsync.c: Likewise.
	* db2/os_map.c: Likewise.
	* db2/os_oflags.c: Likewise.
	* db2/os_open.c: Likewise.
	* db2/os_rpath.c: Likewise.
	* db2/os_rw.c: Likewise.
	* db2/os_seek.c: Likewise.
	* db2/os_sleep.c: Likewise.
	* db2/os_spin.c: Likewise.
	* db2/os_stat.c: Likewise.
	* db2/os_unlink.c: Likewise.
	* db2/db_archive.c: Likewise.
	* db2/db_checkpoint.c: Likewise.
	* db2/db_deadlock.c: Likewise.
	* db2/db_dump.c: Likewise.
	* db2/db_dump185.c: Likewise.
	* db2/db_load.c: Likewise.
	* db2/db_printlog.c: Likewise.
	* db2/db_recover.c: Likewise.
	* db2/db_stat.c: Likewise.
	* db2/txn.c: Likewise.
	* db2/txn.src: Likewise.
	* db2/txn_auto.c: Likewise.
	* db2/txn_rec.c: Likewise.

	* elf/rtld.c: Move definition of __libc_stack_end to ...
	* sysdeps/generic/dl-sysdep.h: ...here.

	* sysdeps/unix/sysv/linux/fstatvfs.c: Handle nodiratime option.
	* sysdeps/unix/sysv/linux/bits/statvfs.h: Define ST_NODIRATIME.
	* sysdeps/unix/sysv/linux/sys/mount.h: Define MS_NODIRATIME.

1998-06-08 21:44  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/fstatvfs.c: Handle constant option string
	from mntent correctly.

1998-06-06  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* sunrpc/Makefile (generated): Correct typo.

1998-06-04  Philip Blundell  <philb@gnu.org>

	* elf/elf.h (EM_ARM, et al.): New definitions.
	* sysdeps/arm/dl-machine.h: Update for new draft ARM ELF ABI.

9 files changed, 458 insertions, 321 deletions

diff --git a/db2/progs/db_archive/db_archive.c b/db2/progs/db_archive/db_archive.c
index a9c6c28..691824c 100644
--- a/db2/progs/db_archive/db_archive.c
+++ b/db2/progs/db_archive/db_archive.c
@@ -1,7 +1,7 @@
 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 1996, 1997
+ * Copyright (c) 1996, 1997, 1998
  *	Sleepycat Software.  All rights reserved.
  */
 
@@ -9,9 +9,9 @@
 
 #ifndef lint
 static const char copyright[] =
-"@(#) Copyright (c) 1997\n\
+"@(#) Copyright (c) 1996, 1997, 1998\n\
 	Sleepycat Software Inc.  All rights reserved.\n";
-static const char sccsid[] = "@(#)db_archive.c	10.15 (Sleepycat) 8/27/97";
+static const char sccsid[] = "@(#)db_archive.c	10.17 (Sleepycat) 4/10/98";
 #endif
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -50,7 +50,8 @@ main(argc, argv)
 	extern char *optarg;
 	extern int optind;
 	DB_ENV *dbenv;
-	int ch, flags, verbose;
+	u_int32_t flags;
+	int ch, verbose;
 	char *home, **list;
 
 	flags = verbose = 0;
diff --git a/db2/progs/db_checkpoint/db_checkpoint.c b/db2/progs/db_checkpoint/db_checkpoint.c
index 3157a52..74f95cc 100644
--- a/db2/progs/db_checkpoint/db_checkpoint.c
+++ b/db2/progs/db_checkpoint/db_checkpoint.c
@@ -1,7 +1,7 @@
 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 1996, 1997
+ * Copyright (c) 1996, 1997, 1998
  *	Sleepycat Software.  All rights reserved.
  */
 
@@ -9,9 +9,9 @@
 
 #ifndef lint
 static const char copyright[] =
-"@(#) Copyright (c) 1997\n\
+"@(#) Copyright (c) 1996, 1997, 1998\n\
 	Sleepycat Software Inc.  All rights reserved.\n";
-static const char sccsid[] = "@(#)db_checkpoint.c	10.14 (Sleepycat) 1/17/98";
+static const char sccsid[] = "@(#)db_checkpoint.c	10.17 (Sleepycat) 5/3/98";
 #endif
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -37,7 +37,6 @@ static const char sccsid[] = "@(#)db_checkpoint.c	10.14 (Sleepycat) 1/17/98";
 #include "common_ext.h"
 
 char	*check __P((DB_ENV *, long, long));
-int	 checkpoint __P((DB_ENV *, char *, int));
 DB_ENV	*db_init __P((char *));
 int	 logpid __P((char *, int));
 int	 main __P((int, char *[]));
@@ -58,26 +57,39 @@ main(argc, argv)
 	extern int optind;
 	DB_ENV *dbenv;
 	time_t now;
-	long kbytes, minutes, seconds;
-	int ch, eval, verbose;
+	long argval;
+	u_int32_t kbytes, minutes, seconds;
+	int ch, eval, once, verbose;
 	char *home, *logfile;
 
-	home = logfile = NULL;
+	/*
+	 * XXX
+	 * Don't allow a fully unsigned 32-bit number, some compilers get
+	 * upset and require it to be specified in hexadecimal and so on.
+	 */
+#define	MAX_UINT32_T	2147483647
+
 	kbytes = minutes = 0;
-	verbose = 0;
-	while ((ch = getopt(argc, argv, "h:k:L:p:v")) != EOF)
+	once = verbose = 0;
+	home = logfile = NULL;
+	while ((ch = getopt(argc, argv, "1h:k:L:p:v")) != EOF)
 		switch (ch) {
+		case '1':
+			once = 1;
+			break;
 		case 'h':
 			home = optarg;
 			break;
 		case 'k':
-			get_long(optarg, 1, LONG_MAX, &kbytes);
+			get_long(optarg, 1, (long)MAX_UINT32_T, &argval);
+			kbytes = argval;
 			break;
 		case 'L':
 			logfile = optarg;
 			break;
 		case 'p':
-			get_long(optarg, 1, LONG_MAX, &minutes);
+			get_long(optarg, 1, (long)MAX_UINT32_T, &argval);
+			minutes = argval;
 			break;
 		case 'v':
 			verbose = 1;
@@ -92,8 +104,8 @@ main(argc, argv)
 	if (argc != 0)
 		usage();
 
-	if (kbytes == 0 && minutes == 0) {
-		warnx("at least one of -k and -p must be specified");
+	if (once == 0 && kbytes == 0 && minutes == 0) {
+		warnx("at least one of -1, -k and -p must be specified");
 		usage();
 	}
 
@@ -113,8 +125,6 @@ main(argc, argv)
 	eval = 0;
 	seconds = kbytes != 0 ? 30 : minutes * 60;
 	while (!interrupted) {
-		(void)__db_sleep(seconds, 0);
-
 		if (verbose) {
 			(void)time(&now);
 			printf("checkpoint: %s", ctime(&now));
@@ -134,6 +144,11 @@ main(argc, argv)
 			__db_err(dbenv, "checkpoint: %s", strerror(errno));
 			break;
 		}
+
+		if (once)
+			break;
+
+		(void)__db_sleep(seconds, 0);
 	}
 
 	if (logfile != NULL && logpid(logfile, 0))
@@ -244,6 +259,6 @@ void
 usage()
 {
 	(void)fprintf(stderr,
-    "usage: db_checkpoint [-v] [-h home] [-k kbytes] [-L file] [-p min]\n");
+    "usage: db_checkpoint [-1v] [-h home] [-k kbytes] [-L file] [-p min]\n");
 	exit(1);
 }
diff --git a/db2/progs/db_deadlock/db_deadlock.c b/db2/progs/db_deadlock/db_deadlock.c
index 97fa8ca..49a5241 100644
--- a/db2/progs/db_deadlock/db_deadlock.c
+++ b/db2/progs/db_deadlock/db_deadlock.c
@@ -1,7 +1,7 @@
 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 1996, 1997
+ * Copyright (c) 1996, 1997, 1998
  *	Sleepycat Software.  All rights reserved.
  */
 
@@ -9,9 +9,9 @@
 
 #ifndef lint
 static const char copyright[] =
-"@(#) Copyright (c) 1997\n\
+"@(#) Copyright (c) 1996, 1997, 1998\n\
 	Sleepycat Software Inc.  All rights reserved.\n";
-static const char sccsid[] = "@(#)db_deadlock.c	10.17 (Sleepycat) 1/15/98";
+static const char sccsid[] = "@(#)db_deadlock.c	10.19 (Sleepycat) 4/10/98";
 #endif
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -54,13 +54,15 @@ main(argc, argv)
 	u_int32_t atype;
 	time_t now;
 	long usecs;
-	int ch, flags, verbose;
+	u_int32_t flags;
+	int ch, verbose;
 	char *home, *logfile;
 
 	atype = DB_LOCK_DEFAULT;
 	home = logfile = NULL;
 	usecs = 0;
-	flags = verbose = 0;
+	flags = 0;
+	verbose = 0;
 	while ((ch = getopt(argc, argv, "a:h:L:t:vw")) != EOF)
 		switch (ch) {
 		case 'a':
diff --git a/db2/progs/db_dump/db_dump.c b/db2/progs/db_dump/db_dump.c
index c097190..f532bc2 100644
--- a/db2/progs/db_dump/db_dump.c
+++ b/db2/progs/db_dump/db_dump.c
@@ -1,7 +1,7 @@
 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 1996, 1997
+ * Copyright (c) 1996, 1997, 1998
  *	Sleepycat Software.  All rights reserved.
  */
 
@@ -9,9 +9,9 @@
 
 #ifndef lint
 static const char copyright[] =
-"@(#) Copyright (c) 1997\n\
+"@(#) Copyright (c) 1996, 1997, 1998\n\
 	Sleepycat Software Inc.  All rights reserved.\n";
-static const char sccsid[] = "@(#)db_dump.c	10.16 (Sleepycat) 8/27/97";
+static const char sccsid[] = "@(#)db_dump.c	10.19 (Sleepycat) 5/23/98";
 #endif
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -35,8 +35,6 @@ static const char sccsid[] = "@(#)db_dump.c	10.16 (Sleepycat) 8/27/97";
 
 void	configure __P((char *));
 DB_ENV *db_init __P((char *));
-void	dbt_dump __P((DBT *));
-void	dbt_print __P((DBT *));
 int	main __P((int, char *[]));
 void	pheader __P((DB *, int));
 void	usage __P((void));
@@ -55,11 +53,11 @@ main(argc, argv)
 	DBC *dbcp;
 	DBT key, data;
 	DB_ENV *dbenv;
-	int ch, dflag, pflag;
+	int ch, checkprint, dflag;
 	char *home;
 
 	home = NULL;
-	dflag = pflag = 0;
+	checkprint = dflag = 0;
 	while ((ch = getopt(argc, argv, "df:h:p")) != EOF)
 		switch (ch) {
 		case 'd':
@@ -73,7 +71,7 @@ main(argc, argv)
 			home = optarg;
 			break;
 		case 'p':
-			pflag = 1;
+			checkprint = 1;
 			break;
 		case '?':
 		default:
@@ -89,7 +87,7 @@ main(argc, argv)
 		if (home != NULL)
 			errx(1,
 			    "the -d and -h options may not both be specified");
-		if (pflag)
+		if (checkprint)
 			errx(1,
 			    "the -d and -p options may not both be specified");
 	}
@@ -116,23 +114,19 @@ main(argc, argv)
 	}
 
 	/* Print out the header. */
-	pheader(dbp, pflag);
+	pheader(dbp, checkprint);
 
 	/* Print out the key/data pairs. */
 	memset(&key, 0, sizeof(key));
 	memset(&data, 0, sizeof(data));
-	if (pflag)
-		while ((errno = dbcp->c_get(dbcp, &key, &data, DB_NEXT)) == 0) {
-			if (dbp->type != DB_RECNO)
-				dbt_print(&key);
-			dbt_print(&data);
-		}
-	else
-		while ((errno = dbcp->c_get(dbcp, &key, &data, DB_NEXT)) == 0) {
-			if (dbp->type != DB_RECNO)
-				dbt_dump(&key);
-			dbt_dump(&data);
-		}
+	while ((errno = dbcp->c_get(dbcp, &key, &data, DB_NEXT)) == 0) {
+		if (dbp->type != DB_RECNO &&
+		    (errno = __db_prdbt(&key, checkprint, stdout)) != 0)
+			break;
+		if ((errno = __db_prdbt(&data, checkprint, stdout)) != 0)
+			break;
+	}
+
 	if (errno != DB_NOTFOUND)
 		err(1, "cursor get");
 
@@ -229,47 +223,6 @@ pheader(dbp, pflag)
 	printf("HEADER=END\n");
 }
 
-static char hex[] = "0123456789abcdef";
-
-/*
- * dbt_dump --
- *	Write out a key or data item using byte values.
- */
-void
-dbt_dump(dbtp)
-	DBT *dbtp;
-{
-	u_int32_t len;
-	u_int8_t *p;
-
-	for (len = dbtp->size, p = dbtp->data; len--; ++p)
-		(void)printf("%c%c",
-		    hex[(u_int8_t)(*p & 0xf0) >> 4], hex[*p & 0x0f]);
-	printf("\n");
-}
-
-/*
- * dbt_print --
- *	Write out a key or data item using printable characters.
- */
-void
-dbt_print(dbtp)
-	DBT *dbtp;
-{
-	u_int32_t len;
-	u_int8_t *p;
-
-	for (len = dbtp->size, p = dbtp->data; len--; ++p)
-		if (isprint(*p)) {
-			if (*p == '\\')
-				(void)printf("\\");
-			(void)printf("%c", *p);
-		} else
-			(void)printf("\\%c%c",
-			    hex[(u_int8_t)(*p & 0xf0) >> 4], hex[*p & 0x0f]);
-	printf("\n");
-}
-
 /*
  * usage --
  *	Display the usage message.
diff --git a/db2/progs/db_dump185/db_dump185.c b/db2/progs/db_dump185/db_dump185.c
index 5ec7673..1745110 100644
--- a/db2/progs/db_dump185/db_dump185.c
+++ b/db2/progs/db_dump185/db_dump185.c
@@ -1,7 +1,7 @@
 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 1996, 1997
+ * Copyright (c) 1996, 1997, 1998
  *	Sleepycat Software.  All rights reserved.
  */
 
@@ -9,9 +9,9 @@
 
 #ifndef lint
 static const char copyright[] =
-"@(#) Copyright (c) 1997\n\
+"@(#) Copyright (c) 1996, 1997, 1998\n\
 	Sleepycat Software Inc.  All rights reserved.\n";
-static const char sccsid[] = "@(#)db_dump185.c	10.8 (Sleepycat) 9/21/97";
+static const char sccsid[] = "@(#)db_dump185.c	10.10 (Sleepycat) 4/10/98";
 #endif
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -30,7 +30,7 @@ static const char sccsid[] = "@(#)db_dump185.c	10.8 (Sleepycat) 9/21/97";
 #include "clib_ext.h"
 
 /* Hash Table Information */
-typedef struct hashhdr {		/* Disk resident portion */
+typedef struct hashhdr185 {		/* Disk resident portion */
 	int		magic;		/* Magic NO for hash tables */
 	int		version;	/* Version ID */
 	u_int32_t	lorder;		/* Byte Order */
@@ -48,11 +48,34 @@ typedef struct hashhdr {		/* Disk resident portion */
 					 * table */
 	int		ffactor;	/* Fill factor */
 	int		nkeys;		/* Number of keys in hash table */
-} HASHHDR;
+} HASHHDR185;
+typedef struct htab185	 {		/* Memory resident data structure */
+	HASHHDR185 	hdr;		/* Header */
+} HTAB185;
 
-typedef struct htab	 {		/* Memory resident data structure */
-	HASHHDR 	hdr;		/* Header */
-} HTAB;
+/* Hash Table Information */
+typedef struct hashhdr186 {	/* Disk resident portion */
+	int32_t	magic;		/* Magic NO for hash tables */
+	int32_t	version;	/* Version ID */
+	int32_t	lorder;		/* Byte Order */
+	int32_t	bsize;		/* Bucket/Page Size */
+	int32_t	bshift;		/* Bucket shift */
+	int32_t	ovfl_point;	/* Where overflow pages are being allocated */
+	int32_t	last_freed;	/* Last overflow page freed */
+	int32_t	max_bucket;	/* ID of Maximum bucket in use */
+	int32_t	high_mask;	/* Mask to modulo into entire table */
+	int32_t	low_mask;	/* Mask to modulo into lower half of table */
+	int32_t	ffactor;	/* Fill factor */
+	int32_t	nkeys;		/* Number of keys in hash table */
+	int32_t	hdrpages;	/* Size of table header */
+	int32_t	h_charkey;	/* value of hash(CHARKEY) */
+#define NCACHED	32		/* number of bit maps and spare points */
+	int32_t	spares[NCACHED];/* spare pages for overflow */
+	u_int16_t	bitmaps[NCACHED];	/* address of overflow page bitmaps */
+} HASHHDR186;
+typedef struct htab186	 {		/* Memory resident data structure */
+	HASHHDR186 	hdr;		/* Header */
+} HTAB186;
 
 typedef struct _epgno {
 	u_int32_t pgno;			/* the page number */
@@ -149,8 +172,8 @@ typedef struct _btree {
 	u_int32_t flags;
 } BTREE;
 
-void	db_185_btree __P((DB *, int));
-void	db_185_hash __P((DB *, int));
+void	db_btree __P((DB *, int));
+void	db_hash __P((DB *, int));
 void	dbt_dump __P((DBT *));
 void	dbt_print __P((DBT *));
 int	main __P((int, char *[]));
@@ -193,9 +216,9 @@ main(argc, argv)
 	if ((dbp = dbopen(argv[0], O_RDONLY, 0, DB_BTREE, NULL)) == NULL) {
 		if ((dbp = dbopen(argv[0], O_RDONLY, 0, DB_HASH, NULL)) == NULL)
 			err(1, "%s", argv[0]);
-		db_185_hash(dbp, pflag);
+		db_hash(dbp, pflag);
 	} else
-		db_185_btree(dbp, pflag);
+		db_btree(dbp, pflag);
 
 	/*
 	 * !!!
@@ -219,36 +242,43 @@ main(argc, argv)
 }
 
 /*
- * db_185_hash --
+ * db_hash --
  *	Dump out hash header information.
  */
 void
-db_185_hash(dbp, pflag)
+db_hash(dbp, pflag)
 	DB *dbp;
 	int pflag;
 {
-	HTAB *hashp;
-
-	hashp = dbp->internal;
+	HTAB185 *hash185p;
+	HTAB186 *hash186p;
 
 	printf("format=%s\n", pflag ? "print" : "bytevalue");
 	printf("type=hash\n");
-	printf("h_ffactor=%lu\n", (u_long)hashp->hdr.ffactor);
-#ifdef NOT_AVAILABLE_IN_DB_185
-	printf("h_nelem=%lu\n", (u_long)hashp->hdr.nelem);
-#endif
-	if (hashp->hdr.lorder != 0)
-		printf("db_lorder=%lu\n", (u_long)hashp->hdr.lorder);
-	printf("db_pagesize=%lu\n", (u_long)hashp->hdr.bsize);
+
+	/* DB 1.85 was version 2, DB 1.86 was version 3. */
+	hash185p = dbp->internal;
+	if (hash185p->hdr.version > 2) {
+		hash186p = dbp->internal;
+		printf("h_ffactor=%lu\n", (u_long)hash186p->hdr.ffactor);
+		if (hash186p->hdr.lorder != 0)
+			printf("db_lorder=%lu\n", (u_long)hash186p->hdr.lorder);
+		printf("db_pagesize=%lu\n", (u_long)hash186p->hdr.bsize);
+	} else {
+		printf("h_ffactor=%lu\n", (u_long)hash185p->hdr.ffactor);
+		if (hash185p->hdr.lorder != 0)
+			printf("db_lorder=%lu\n", (u_long)hash185p->hdr.lorder);
+		printf("db_pagesize=%lu\n", (u_long)hash185p->hdr.bsize);
+	}
 	printf("HEADER=END\n");
 }
 
 /*
- * db_185_btree --
+ * db_btree --
  *	Dump out btree header information.
  */
 void
-db_185_btree(dbp, pflag)
+db_btree(dbp, pflag)
 	DB *dbp;
 	int pflag;
 {
diff --git a/db2/progs/db_load/db_load.c b/db2/progs/db_load/db_load.c
index afa5730..5ac1775 100644
--- a/db2/progs/db_load/db_load.c
+++ b/db2/progs/db_load/db_load.c
@@ -1,7 +1,7 @@
 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 1996, 1997
+ * Copyright (c) 1996, 1997, 1998
  *	Sleepycat Software.  All rights reserved.
  */
 
@@ -9,14 +9,13 @@
 
 #ifndef lint
 static const char copyright[] =
-"@(#) Copyright (c) 1997\n\
+"@(#) Copyright (c) 1996, 1997, 1998\n\
 	Sleepycat Software Inc.  All rights reserved.\n";
-static const char sccsid[] = "@(#)db_load.c	10.15 (Sleepycat) 12/29/97";
+static const char sccsid[] = "@(#)db_load.c	10.20 (Sleepycat) 6/2/98";
 #endif
 
 #ifndef NO_SYSTEM_INCLUDES
 #include <sys/types.h>
-#include <sys/stat.h>
 
 #include <errno.h>
 #include <limits.h>
@@ -27,6 +26,8 @@ static const char sccsid[] = "@(#)db_load.c	10.15 (Sleepycat) 12/29/97";
 #endif
 
 #include "db_int.h"
+#include "db_page.h"
+#include "db_am.h"
 #include "clib_ext.h"
 
 void	badnum __P((void));
@@ -55,7 +56,8 @@ main(argc, argv)
 	DB_ENV *dbenv;
 	DB_INFO dbinfo;
 	db_recno_t recno;
-	int ch, no_header, pflag;
+	u_int32_t db_nooverwrite;
+	int ch, checkprint, existed, no_header;
 	char **clist, **clp, *home;
 
 	/* Allocate enough room for configuration arguments. */
@@ -63,9 +65,10 @@ main(argc, argv)
 		err(1, NULL);
 
 	home = NULL;
-	no_header = 0;
+	db_nooverwrite = 0;
+	existed = checkprint = no_header = 0;
 	argtype = dbtype = DB_UNKNOWN;
-	while ((ch = getopt(argc, argv, "c:f:h:Tt:")) != EOF)
+	while ((ch = getopt(argc, argv, "c:f:h:nTt:")) != EOF)
 		switch (ch) {
 		case 'c':
 			*clp++ = optarg;
@@ -77,8 +80,11 @@ main(argc, argv)
 		case 'h':
 			home = optarg;
 			break;
+		case 'n':
+			db_nooverwrite = DB_NOOVERWRITE;
+			break;
 		case 'T':
-			no_header = pflag = 1;
+			no_header = checkprint = 1;
 			break;
 		case 't':
 			if (strcmp(optarg, "btree") == 0) {
@@ -105,18 +111,18 @@ main(argc, argv)
 	if (argc != 1)
 		usage();
 
-	/* Initialize the environment. */
-	dbenv = db_init(home);
-	memset(&dbinfo, 0, sizeof(DB_INFO));
+	/* Initialize the environment if the user specified one. */
+	dbenv = home == NULL ? NULL : db_init(home);
 
 	/*
 	 * Read the header.  If there isn't any header, we're expecting flat
-	 * text, set the pflag appropriately.
+	 * text, set the checkprint flag appropriately.
 	 */
+	memset(&dbinfo, 0, sizeof(DB_INFO));
 	if (no_header)
 		dbtype = argtype;
 	else {
-		rheader(&dbtype, &pflag, &dbinfo);
+		rheader(&dbtype, &checkprint, &dbinfo);
 		if (argtype != DB_UNKNOWN) {
 			/* Conversion to/from recno is prohibited. */
 			if ((dbtype == DB_RECNO && argtype != DB_RECNO) ||
@@ -133,17 +139,20 @@ main(argc, argv)
 	configure(&dbinfo, clist);
 
 	/* Open the DB file. */
-	if ((errno = db_open(argv[0], dbtype, DB_CREATE | DB_TRUNCATE,
-	    S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH,
-	    dbenv, &dbinfo, &dbp)) != 0)
+	if ((errno = db_open(argv[0], dbtype, DB_CREATE,
+	    __db_omode("rwrwrw"), dbenv, &dbinfo, &dbp)) != 0)
 		err(1, "%s", argv[0]);
 
 	/* Initialize the key/data pair. */
 	memset(&key, 0, sizeof(DBT));
-	if ((key.data = (void *)malloc(key.ulen = 1024)) == NULL) {
-		errno = ENOMEM;
-		err(1, NULL);
-	}
+	if (dbtype == DB_RECNO) {
+		key.data = &recno;
+		key.size = sizeof(recno);
+	} else
+		if ((key.data = (void *)malloc(key.ulen = 1024)) == NULL) {
+			errno = ENOMEM;
+			err(1, NULL);
+		}
 	memset(&data, 0, sizeof(DBT));
 	if ((data.data = (void *)malloc(data.ulen = 1024)) == NULL) {
 		errno = ENOMEM;
@@ -151,22 +160,17 @@ main(argc, argv)
 	}
 
 	/* Get each key/data pair and add them to the database. */
-	if (dbtype == DB_RECNO) {
-		key.data = &recno;
-		key.size = sizeof(recno);
-		for (recno = 1;; ++recno) {
-			if (pflag) {
+	for (recno = 1;; ++recno) {
+		if (dbtype == DB_RECNO)
+			if (checkprint) {
 				if (dbt_rprint(&data))
 					break;
-			} else
+			} else {
 				if (dbt_rdump(&data))
 					break;
-			if ((errno = dbp->put(dbp, NULL, &key, &data, 0)) != 0)
-				err(1, "%s", argv[0]);
-		}
-	} else
-		for (;;) {
-			if (pflag) {
+			}
+		else
+			if (checkprint) {
 				if (dbt_rprint(&key))
 					break;
 				if (dbt_rprint(&data))
@@ -177,13 +181,26 @@ main(argc, argv)
 				if (dbt_rdump(&data))
 fmt:					err(1, "odd number of key/data pairs");
 			}
-			if ((errno = dbp->put(dbp, NULL, &key, &data, 0)) != 0)
-				err(1, "%s", argv[0]);
+		switch (errno =
+		    dbp->put(dbp, NULL, &key, &data, db_nooverwrite)) {
+		case 0:
+			break;
+		case DB_KEYEXIST:
+			existed = 1;
+			warnx("%s: line %d: key already exists, not loaded:",
+			    argv[0],
+			    dbtype == DB_RECNO ? recno : recno * 2 - 1);
+			(void)__db_prdbt(&key, checkprint, stderr);
+			break;
+		default:
+			err(1, "%s", argv[0]);
+			/* NOTREACHED */
 		}
+	}
 
 	if ((errno = dbp->close(dbp, 0)) != 0)
 		err(1, "%s", argv[0]);
-	return (0);
+	return (existed ? 1 : 0);
 }
 
 /*
@@ -200,13 +217,26 @@ db_init(home)
 		errno = ENOMEM;
 		err(1, NULL);
 	}
-	dbenv->db_errfile = stderr;
-	dbenv->db_errpfx = progname;
 
-	if ((errno =
-	    db_appinit(home, NULL, dbenv, DB_CREATE | DB_USE_ENVIRON)) != 0)
-		err(1, "db_appinit");
-	return (dbenv);
+	/*
+	 * The database may be live, try and use the shared regions.
+	 *
+	 * If it works, we're done.  Set the error output options so that
+	 * future errors are correctly reported.
+	 */
+	if ((errno = db_appinit(home, NULL, dbenv, DB_INIT_LOCK |
+	    DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN | DB_USE_ENVIRON)) == 0) {
+		dbenv->db_errfile = stderr;
+		dbenv->db_errpfx = progname;
+		return (dbenv);
+	}
+
+	/*
+	 * If the db_appinit fails, assume the database isn't live, and don't
+	 * bother with an environment.
+	 */
+	free(dbenv);
+	return (NULL);
 }
 
 #define	FLAG(name, value, keyword, flag)				\
@@ -279,16 +309,16 @@ configure(dbinfop, clp)
  *	Read the header message.
  */
 void
-rheader(dbtypep, pflagp, dbinfop)
+rheader(dbtypep, checkprintp, dbinfop)
 	DBTYPE *dbtypep;
-	int *pflagp;
+	int *checkprintp;
 	DB_INFO *dbinfop;
 {
 	long lineno, val;
 	char name[256], value[256];
 
 	*dbtypep = DB_UNKNOWN;
-	*pflagp = 0;
+	*checkprintp = 0;
 
 	for (lineno = 1;; ++lineno) {
 		/* If we don't see the expected information, it's an error. */
@@ -301,11 +331,11 @@ rheader(dbtypep, pflagp, dbinfop)
 
 		if (strcmp(name, "format") == 0) {
 			if (strcmp(value, "bytevalue") == 0) {
-				*pflagp = 0;
+				*checkprintp = 0;
 				continue;
 			}
 			if (strcmp(value, "print") == 0) {
-				*pflagp = 1;
+				*checkprintp = 1;
 				continue;
 			}
 			errx(1, "line %d: unknown format", lineno);
@@ -390,39 +420,6 @@ dbt_rprint(dbtp)
 }
 
 /*
- * digitize --
- *	Convert a character to an integer.
- */
-int
-digitize(c)
-	int c;
-{
-	switch (c) {			/* Don't depend on ASCII ordering. */
-	case '0': return (0);
-	case '1': return (1);
-	case '2': return (2);
-	case '3': return (3);
-	case '4': return (4);
-	case '5': return (5);
-	case '6': return (6);
-	case '7': return (7);
-	case '8': return (8);
-	case '9': return (9);
-	case 'a': return (10);
-	case 'b': return (11);
-	case 'c': return (12);
-	case 'd': return (13);
-	case 'e': return (14);
-	case 'f': return (15);
-	}
-
-	err(1, "unexpected hexadecimal value");
-	/* NOTREACHED */
-
-	return (0);
-}
-
-/*
  * dbt_rdump --
  *	Read a byte dump line into a DBT structure.
  */
@@ -459,6 +456,39 @@ dbt_rdump(dbtp)
 }
 
 /*
+ * digitize --
+ *	Convert a character to an integer.
+ */
+int
+digitize(c)
+	int c;
+{
+	switch (c) {			/* Don't depend on ASCII ordering. */
+	case '0': return (0);
+	case '1': return (1);
+	case '2': return (2);
+	case '3': return (3);
+	case '4': return (4);
+	case '5': return (5);
+	case '6': return (6);
+	case '7': return (7);
+	case '8': return (8);
+	case '9': return (9);
+	case 'a': return (10);
+	case 'b': return (11);
+	case 'c': return (12);
+	case 'd': return (13);
+	case 'e': return (14);
+	case 'f': return (15);
+	}
+
+	err(1, "unexpected hexadecimal value");
+	/* NOTREACHED */
+
+	return (0);
+}
+
+/*
  * badnum --
  *	Display the bad number message.
  */
@@ -475,7 +505,8 @@ badnum()
 void
 usage()
 {
-	(void)fprintf(stderr,
-"usage: db_load [-T]\n\t[-c name=value] [-f file] [-h home] [-t btree | hash] db_file\n");
+	(void)fprintf(stderr, "%s\n\t%s\n",
+	    "usage: db_load [-nT]",
+    "[-c name=value] [-f file] [-h home] [-t btree | hash | recno] db_file");
 	exit(1);
 }
diff --git a/db2/progs/db_printlog/db_printlog.c b/db2/progs/db_printlog/db_printlog.c
index 24554bc..3b48ad9 100644
--- a/db2/progs/db_printlog/db_printlog.c
+++ b/db2/progs/db_printlog/db_printlog.c
@@ -1,7 +1,7 @@
 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 1996, 1997
+ * Copyright (c) 1996, 1997, 1998
  *	Sleepycat Software.  All rights reserved.
  */
 
@@ -9,9 +9,9 @@
 
 #ifndef lint
 static const char copyright[] =
-"@(#) Copyright (c) 1997\n\
+"@(#) Copyright (c) 1996, 1997, 1998\n\
 	Sleepycat Software Inc.  All rights reserved.\n";
-static const char sccsid[] = "@(#)db_printlog.c	10.11 (Sleepycat) 1/8/98";
+static const char sccsid[] = "@(#)db_printlog.c	10.12 (Sleepycat) 4/10/98";
 #endif
 
 #ifndef NO_SYSTEM_INCLUDES
diff --git a/db2/progs/db_recover/db_recover.c b/db2/progs/db_recover/db_recover.c
index f902fed..a284572 100644
--- a/db2/progs/db_recover/db_recover.c
+++ b/db2/progs/db_recover/db_recover.c
@@ -1,7 +1,7 @@
 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 1996, 1997
+ * Copyright (c) 1996, 1997, 1998
  *	Sleepycat Software.  All rights reserved.
  */
 
@@ -9,9 +9,9 @@
 
 #ifndef lint
 static const char copyright[] =
-"@(#) Copyright (c) 1997\n\
+"@(#) Copyright (c) 1996, 1997, 1998\n\
 	Sleepycat Software Inc.  All rights reserved.\n";
-static const char sccsid[] = "@(#)db_recover.c	10.17 (Sleepycat) 1/15/98";
+static const char sccsid[] = "@(#)db_recover.c	10.19 (Sleepycat) 4/10/98";
 #endif
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -29,7 +29,7 @@ static const char sccsid[] = "@(#)db_recover.c	10.17 (Sleepycat) 1/15/98";
 #include "common_ext.h"
 #include "clib_ext.h"
 
-DB_ENV	*db_init __P((char *, int, int));
+DB_ENV	*db_init __P((char *, u_int32_t, int));
 int	 main __P((int, char *[]));
 void	 usage __P((void));
 
@@ -45,7 +45,8 @@ main(argc, argv)
 	extern int optind;
 	DB_ENV *dbenv;
 	time_t now;
-	int ch, flags, verbose;
+	u_int32_t flags;
+	int ch, verbose;
 	char *home;
 
 	home = NULL;
@@ -88,10 +89,11 @@ main(argc, argv)
 DB_ENV *
 db_init(home, flags, verbose)
 	char *home;
-	int flags, verbose;
+	u_int32_t flags;
+	int verbose;
 {
 	DB_ENV *dbenv;
-	int local_flags;
+	u_int32_t local_flags;
 
 	if ((dbenv = (DB_ENV *)calloc(sizeof(DB_ENV), 1)) == NULL) {
 		errno = ENOMEM;
diff --git a/db2/progs/db_stat/db_stat.c b/db2/progs/db_stat/db_stat.c
index 5295f01..f255180 100644
--- a/db2/progs/db_stat/db_stat.c
+++ b/db2/progs/db_stat/db_stat.c
@@ -1,7 +1,7 @@
 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 1996, 1997
+ * Copyright (c) 1996, 1997, 1998
  *	Sleepycat Software.  All rights reserved.
  */
 
@@ -9,9 +9,9 @@
 
 #ifndef lint
 static const char copyright[] =
-"@(#) Copyright (c) 1997\n\
+"@(#) Copyright (c) 1996, 1997, 1998\n\
 	Sleepycat Software Inc.  All rights reserved.\n";
-static const char sccsid[] = "@(#)db_stat.c	8.30 (Sleepycat) 1/8/98";
+static const char sccsid[] = "@(#)db_stat.c	8.38 (Sleepycat) 5/30/98";
 #endif
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -27,25 +27,35 @@ static const char sccsid[] = "@(#)db_stat.c	8.30 (Sleepycat) 1/8/98";
 #endif
 
 #include "db_int.h"
+#include "shqueue.h"
+#include "db_shash.h"
+#include "lock.h"
+#include "mp.h"
 #include "clib_ext.h"
 
 #undef stat
 
-typedef enum { T_NOTSET, T_DB, T_LOG, T_MPOOL, T_TXN } test_t;
+typedef enum { T_NOTSET, T_DB, T_LOCK, T_LOG, T_MPOOL, T_TXN } test_t;
 
+int	argcheck __P((char *, const char *));
 void	btree_stats __P((DB *));
 DB_ENV *db_init __P((char *, test_t));
+void	dl __P((const char *, u_long));
 void	hash_stats __P((DB *));
-int	main __P((int, char *[]));
+int	lock_ok __P((char *));
+void	lock_stats __P((DB_ENV *));
 void	log_stats __P((DB_ENV *));
+int	main __P((int, char *[]));
+int	mpool_ok __P((char *));
 void	mpool_stats __P((DB_ENV *));
 void	onint __P((int));
 void	prflags __P((u_int32_t, const FN *));
-void	txn_stats __P((DB_ENV *));
 int	txn_compare __P((const void *, const void *));
+void	txn_stats __P((DB_ENV *));
 void	usage __P((void));
 
 int	 interrupted;
+char	*internal;
 const char
 	*progname = "db_stat";				/* Program name. */
 
@@ -64,8 +74,16 @@ main(argc, argv)
 
 	ttype = T_NOTSET;
 	db = home = NULL;
-	while ((ch = getopt(argc, argv, "d:h:lmt")) != EOF)
+	while ((ch = getopt(argc, argv, "C:cd:h:lM:mNt")) != EOF)
 		switch (ch) {
+		case 'C':
+			ttype = T_LOCK;
+			if (!argcheck(internal = optarg, "Acflmo"))
+				usage();
+			break;
+		case 'c':
+			ttype = T_LOCK;
+			break;
 		case 'd':
 			db = optarg;
 			ttype = T_DB;
@@ -76,9 +94,17 @@ main(argc, argv)
 		case 'l':
 			ttype = T_LOG;
 			break;
+		case 'M':
+			ttype = T_MPOOL;
+			if (!argcheck(internal = optarg, "Ahlm"))
+				usage();
+			break;
 		case 'm':
 			ttype = T_MPOOL;
 			break;
+		case 'N':
+			(void)db_value_set(0, DB_MUTEXLOCKS);
+			break;
 		case 't':
 			ttype = T_TXN;
 			break;
@@ -115,6 +141,9 @@ main(argc, argv)
 		}
 		(void)dbp->close(dbp, 0);
 		break;
+	case T_LOCK:
+		lock_stats(dbenv);
+		break;
 	case T_LOG:
 		log_stats(dbenv);
 		break;
@@ -168,13 +197,12 @@ btree_stats(dbp)
 	prflags(sp->bt_flags, fn);
 	if (dbp->type == DB_BTREE) {
 #ifdef NOT_IMPLEMENTED
-		printf("%lu\tMaximum keys per-page.\n", (u_long)sp->bt_maxkey);
+		dl("Maximum keys per-page.\n", (u_long)sp->bt_maxkey);
 #endif
-		printf("%lu\tMinimum keys per-page.\n", (u_long)sp->bt_minkey);
+		dl("Minimum keys per-page.\n", (u_long)sp->bt_minkey);
 	}
 	if (dbp->type == DB_RECNO) {
-		printf("%lu\tFixed-length record size.\n",
-		    (u_long)sp->bt_re_len);
+		dl("Fixed-length record size.\n", (u_long)sp->bt_re_len);
 		if (isprint(sp->bt_re_pad))
 			printf("%c\tFixed-length record pad.\n",
 			    (int)sp->bt_re_pad);
@@ -182,43 +210,38 @@ btree_stats(dbp)
 			printf("0x%x\tFixed-length record pad.\n",
 			    (int)sp->bt_re_pad);
 	}
-	printf("%lu\tUnderlying tree page size.\n", (u_long)sp->bt_pagesize);
-	printf("%lu\tNumber of levels in the tree.\n", (u_long)sp->bt_levels);
-	printf("%lu\tNumber of keys in the tree.\n", (u_long)sp->bt_nrecs);
-	printf("%lu\tNumber of tree internal pages.\n", (u_long)sp->bt_int_pg);
-	printf("%lu\tNumber of tree leaf pages.\n", (u_long)sp->bt_leaf_pg);
-	printf("%lu\tNumber of tree duplicate pages.\n",
-	    (u_long)sp->bt_dup_pg);
-	printf("%lu\tNumber of tree overflow pages.\n",
-	    (u_long)sp->bt_over_pg);
-	printf("%lu\tNumber of pages on the free list.\n",
-	    (u_long)sp->bt_free);
-	printf("%lu\tNumber of pages freed for reuse.\n",
-	    (u_long)sp->bt_freed);
-	printf("%lu\tNumber of bytes free in tree internal pages (%.0f%% ff)\n",
-	    (u_long)sp->bt_int_pgfree,
-	    PCT(sp->bt_int_pgfree, sp->bt_int_pg));
-	printf("%lu\tNumber of bytes free in tree leaf pages (%.0f%% ff).\n",
-	    (u_long)sp->bt_leaf_pgfree,
-	    PCT(sp->bt_leaf_pgfree, sp->bt_leaf_pg));
-printf("%lu\tNumber of bytes free in tree duplicate pages (%.0f%% ff).\n",
-	    (u_long)sp->bt_dup_pgfree,
-	    PCT(sp->bt_dup_pgfree, sp->bt_dup_pg));
-printf("%lu\tNumber of bytes free in tree overflow pages (%.0f%% ff).\n",
-	    (u_long)sp->bt_over_pgfree,
-	    PCT(sp->bt_over_pgfree, sp->bt_over_pg));
-	printf("%lu\tNumber of bytes saved by prefix compression.\n",
+	dl("Underlying tree page size.\n", (u_long)sp->bt_pagesize);
+	dl("Number of levels in the tree.\n", (u_long)sp->bt_levels);
+	dl("Number of keys in the tree.\n", (u_long)sp->bt_nrecs);
+	dl("Number of tree internal pages.\n", (u_long)sp->bt_int_pg);
+	dl("Number of tree leaf pages.\n", (u_long)sp->bt_leaf_pg);
+	dl("Number of tree duplicate pages.\n", (u_long)sp->bt_dup_pg);
+	dl("Number of tree overflow pages.\n", (u_long)sp->bt_over_pg);
+	dl("Number of pages on the free list.\n", (u_long)sp->bt_free);
+	dl("Number of pages freed for reuse.\n", (u_long)sp->bt_freed);
+	dl("Number of bytes free in tree internal pages",
+	    (u_long)sp->bt_int_pgfree);
+	printf(" (%.0f%% ff).\n", PCT(sp->bt_int_pgfree, sp->bt_int_pg));
+	dl("Number of bytes free in tree leaf pages",
+	    (u_long)sp->bt_leaf_pgfree);
+	printf(" (%.0f%% ff).\n", PCT(sp->bt_leaf_pgfree, sp->bt_leaf_pg));
+	dl("Number of bytes free in tree duplicate pages",
+	    (u_long)sp->bt_dup_pgfree);
+	printf(" (%.0f%% ff).\n", PCT(sp->bt_dup_pgfree, sp->bt_dup_pg));
+	dl("Number of bytes free in tree overflow pages",
+	    (u_long)sp->bt_over_pgfree);
+	printf(" (%.0f%% ff).\n", PCT(sp->bt_over_pgfree, sp->bt_over_pg));
+	dl("Number of bytes saved by prefix compression.\n",
 	    (u_long)sp->bt_pfxsaved);
-	printf("%lu\tTotal number of tree page splits.\n",
-	    (u_long)sp->bt_split);
-	printf("%lu\tNumber of root page splits.\n", (u_long)sp->bt_rootsplit);
-	printf("%lu\tNumber of fast splits.\n", (u_long)sp->bt_fastsplit);
-	printf("%lu\tNumber of hits in tree fast-insert code.\n",
+	dl("Total number of tree page splits.\n", (u_long)sp->bt_split);
+	dl("Number of root page splits.\n", (u_long)sp->bt_rootsplit);
+	dl("Number of fast splits.\n", (u_long)sp->bt_fastsplit);
+	dl("Number of hits in tree fast-insert code.\n",
 	    (u_long)sp->bt_cache_hit);
-	printf("%lu\tNumber of misses in tree fast-insert code.\n",
+	dl("Number of misses in tree fast-insert code.\n",
 	    (u_long)sp->bt_cache_miss);
-	printf("%lu\tNumber of keys added.\n", (u_long)sp->bt_added);
-	printf("%lu\tNumber of keys deleted.\n", (u_long)sp->bt_deleted);
+	dl("Number of keys added.\n", (u_long)sp->bt_added);
+	dl("Number of keys deleted.\n", (u_long)sp->bt_deleted);
 }
 
 /*
@@ -231,10 +254,47 @@ hash_stats(dbp)
 {
 	COMPQUIET(dbp, NULL);
 
+	printf("Hash statistics not currently available.\n");
 	return;
 }
 
 /*
+ * lock_stats --
+ *	Display lock statistics.
+ */
+void
+lock_stats(dbenv)
+	DB_ENV *dbenv;
+{
+	DB_LOCK_STAT *sp;
+
+	if (internal != NULL) {
+		__lock_dump_region(dbenv->lk_info, internal, stdout);
+		return;
+	}
+
+	if (lock_stat(dbenv->lk_info, &sp, NULL))
+		err(1, NULL);
+
+	printf("%#lx\tLock magic number.\n", (u_long)sp->st_magic);
+	printf("%lu\tLock version number.\n", (u_long)sp->st_version);
+	dl("Lock region reference count.\n", (u_long)sp->st_refcnt);
+	dl("Lock region size.\n", (u_long)sp->st_regsize);
+	dl("Maximum number of locks.\n", (u_long)sp->st_maxlocks);
+	dl("Number of lock modes.\n", (u_long)sp->st_nmodes);
+	dl("Number of lock objects.\n", (u_long)sp->st_numobjs);
+	dl("Number of lockers.\n", (u_long)sp->st_nlockers);
+	dl("Number of lock conflicts.\n", (u_long)sp->st_nconflicts);
+	dl("Number of lock requests.\n", (u_long)sp->st_nrequests);
+	dl("Number of lock releases.\n", (u_long)sp->st_nreleases);
+	dl("Number of deadlocks.\n", (u_long)sp->st_ndeadlocks);
+	dl("The number of region locks granted without waiting.\n",
+	    (u_long)sp->st_region_nowait);
+	dl("The number of region locks granted after waiting.\n",
+	    (u_long)sp->st_region_wait);
+}
+
+/*
  * log_stats --
  *	Display log statistics.
  */
@@ -249,6 +309,8 @@ log_stats(dbenv)
 
 	printf("%#lx\tLog magic number.\n", (u_long)sp->st_magic);
 	printf("%lu\tLog version number.\n", (u_long)sp->st_version);
+	dl("Log region reference count.\n", (u_long)sp->st_refcnt);
+	dl("Log region size.\n", (u_long)sp->st_regsize);
 	printf("%#o\tLog file mode.\n", sp->st_mode);
 	if (sp->st_lg_max % MEGABYTE == 0)
 		printf("%luMb\tLog file size.\n",
@@ -261,13 +323,13 @@ log_stats(dbenv)
 	    (u_long)sp->st_w_mbytes, (u_long)sp->st_w_bytes);
 	printf("%luMb\tLog bytes written since last checkpoint (+%lu bytes).\n",
 	    (u_long)sp->st_wc_mbytes, (u_long)sp->st_wc_bytes);
-	printf("%lu\tTotal log file writes.\n", (u_long)sp->st_wcount);
-	printf("%lu\tTotal log file flushes.\n", (u_long)sp->st_scount);
+	dl("Total log file writes.\n", (u_long)sp->st_wcount);
+	dl("Total log file flushes.\n", (u_long)sp->st_scount);
 	printf("%lu\tCurrent log file number.\n", (u_long)sp->st_cur_file);
 	printf("%lu\tCurrent log file offset.\n", (u_long)sp->st_cur_offset);
-	printf("%lu\tThe number of region locks granted without waiting.\n",
+	dl("The number of region locks granted without waiting.\n",
 	    (u_long)sp->st_region_nowait);
-	printf("%lu\tThe number of region locks granted after waiting.\n",
+	dl("The number of region locks granted after waiting.\n",
 	    (u_long)sp->st_region_wait);
 }
 
@@ -282,70 +344,74 @@ mpool_stats(dbenv)
 	DB_MPOOL_FSTAT **fsp;
 	DB_MPOOL_STAT *gsp;
 
+	if (internal != NULL) {
+		__memp_dump_region(dbenv->mp_info, internal, stdout);
+		return;
+	}
+
 	if (memp_stat(dbenv->mp_info, &gsp, &fsp, NULL))
 		err(1, NULL);
 
-	printf("%lu\tCache size (%luK).\n",
-	    (u_long)gsp->st_cachesize, (u_long)gsp->st_cachesize / 1024);
-	printf("%lu\tRequested pages found in the cache",
-	    (u_long)gsp->st_cache_hit);
+	dl("Pool region reference count.\n", (u_long)gsp->st_refcnt);
+	dl("Pool region size.\n", (u_long)gsp->st_regsize);
+	dl("Cache size", (u_long)gsp->st_cachesize);
+	printf(" (%luK).\n", (u_long)gsp->st_cachesize / 1024);
+	dl("Requested pages found in the cache", (u_long)gsp->st_cache_hit);
 	if (gsp->st_cache_hit + gsp->st_cache_miss != 0)
 		printf(" (%.0f%%)", ((double)gsp->st_cache_hit /
 		    (gsp->st_cache_hit + gsp->st_cache_miss)) * 100);
 	printf(".\n");
-	printf("%lu\tRequested pages mapped into the process' address space.\n",
+	dl("Requested pages mapped into the process' address space.\n",
 	    (u_long)gsp->st_map);
-	printf("%lu\tRequested pages not found in the cache.\n",
+	dl("Requested pages not found in the cache.\n",
 	    (u_long)gsp->st_cache_miss);
-	printf("%lu\tPages created in the cache.\n",
-	    (u_long)gsp->st_page_create);
-	printf("%lu\tPages read into the cache.\n", (u_long)gsp->st_page_in);
-	printf("%lu\tPages written from the cache to the backing file.\n",
+	dl("Pages created in the cache.\n", (u_long)gsp->st_page_create);
+	dl("Pages read into the cache.\n", (u_long)gsp->st_page_in);
+	dl("Pages written from the cache to the backing file.\n",
 	    (u_long)gsp->st_page_out);
-	printf("%lu\tClean pages forced from the cache.\n",
+	dl("Clean pages forced from the cache.\n",
 	    (u_long)gsp->st_ro_evict);
-	printf("%lu\tDirty pages forced from the cache.\n",
+	dl("Dirty pages forced from the cache.\n",
 	    (u_long)gsp->st_rw_evict);
-	printf("%lu\tDirty buffers written by trickle-sync thread.\n",
+	dl("Dirty buffers written by trickle-sync thread.\n",
 	    (u_long)gsp->st_page_trickle);
-	printf("%lu\tCurrent clean buffer count.\n",
+	dl("Current clean buffer count.\n",
 	    (u_long)gsp->st_page_clean);
-	printf("%lu\tCurrent dirty buffer count.\n",
+	dl("Current dirty buffer count.\n",
 	    (u_long)gsp->st_page_dirty);
-	printf("%lu\tNumber of hash buckets used for page location.\n",
+	dl("Number of hash buckets used for page location.\n",
 	    (u_long)gsp->st_hash_buckets);
-	printf("%lu\tTotal number of times hash chains searched for a page.\n",
+	dl("Total number of times hash chains searched for a page.\n",
 	    (u_long)gsp->st_hash_searches);
-	printf("%lu\tThe longest hash chain searched for a page.\n",
+	dl("The longest hash chain searched for a page.\n",
 	    (u_long)gsp->st_hash_longest);
-	printf(
-	    "%lu\tTotal number of hash buckets examined for page location.\n",
+	dl("Total number of hash buckets examined for page location.\n",
 	    (u_long)gsp->st_hash_examined);
-	printf("%lu\tThe number of region locks granted without waiting.\n",
+	dl("The number of region locks granted without waiting.\n",
 	    (u_long)gsp->st_region_nowait);
-	printf("%lu\tThe number of region locks granted after waiting.\n",
+	dl("The number of region locks granted after waiting.\n",
 	    (u_long)gsp->st_region_wait);
 
 	for (; fsp != NULL && *fsp != NULL; ++fsp) {
 		printf("%s\n", DB_LINE);
 		printf("%s\n", (*fsp)->file_name);
-		printf("%lu\tPage size.\n", (u_long)(*fsp)->st_pagesize);
-		printf("%lu\tRequested pages found in the cache",
+		dl("Page size.\n", (u_long)(*fsp)->st_pagesize);
+		dl("Requested pages found in the cache",
 		    (u_long)(*fsp)->st_cache_hit);
 		if ((*fsp)->st_cache_hit + (*fsp)->st_cache_miss != 0)
 			printf(" (%.0f%%)", ((double)(*fsp)->st_cache_hit /
 			    ((*fsp)->st_cache_hit + (*fsp)->st_cache_miss)) *
 			    100);
 		printf(".\n");
-	printf("%lu\tRequested pages mapped into the process' address space.\n",
+		dl("Requested pages mapped into the process' address space.\n",
 		    (u_long)(*fsp)->st_map);
-		printf("%lu\tRequested pages not found in the cache.\n",
+		dl("Requested pages not found in the cache.\n",
 		    (u_long)(*fsp)->st_cache_miss);
-		printf("%lu\tPages created in the cache.\n",
+		dl("Pages created in the cache.\n",
 		    (u_long)(*fsp)->st_page_create);
-		printf("%lu\tPages read into the cache.\n",
+		dl("Pages read into the cache.\n",
 		    (u_long)(*fsp)->st_page_in);
-	printf("%lu\tPages written from the cache to the backing file.\n",
+		dl("Pages written from the cache to the backing file.\n",
 		    (u_long)(*fsp)->st_page_out);
 	}
 }
@@ -358,46 +424,48 @@ void
 txn_stats(dbenv)
 	DB_ENV *dbenv;
 {
-	DB_TXN_STAT *tstat;
+	DB_TXN_STAT *sp;
 	u_int32_t i;
 	const char *p;
 
-	if (txn_stat(dbenv->tx_info, &tstat, NULL))
+	if (txn_stat(dbenv->tx_info, &sp, NULL))
 		err(1, NULL);
 
-	p = tstat->st_last_ckp.file == 0 ?
+	dl("Txn region reference count.\n", (u_long)sp->st_refcnt);
+	dl("Txn region size.\n", (u_long)sp->st_regsize);
+	p = sp->st_last_ckp.file == 0 ?
 	    "No checkpoint LSN." : "File/offset for last checkpoint LSN.";
-	printf("%lu/%lu\t%s\n", (u_long)tstat->st_last_ckp.file,
-	    (u_long)tstat->st_last_ckp.offset, p);
-	p = tstat->st_pending_ckp.file == 0 ?
+	printf("%lu/%lu\t%s\n",
+	    (u_long)sp->st_last_ckp.file, (u_long)sp->st_last_ckp.offset, p);
+	p = sp->st_pending_ckp.file == 0 ?
 	    "No pending checkpoint LSN." :
 	    "File/offset for last pending checkpoint LSN.";
 	printf("%lu/%lu\t%s\n",
-	    (u_long)tstat->st_pending_ckp.file,
-	    (u_long)tstat->st_pending_ckp.offset, p);
-	if (tstat->st_time_ckp == 0)
+	    (u_long)sp->st_pending_ckp.file,
+	    (u_long)sp->st_pending_ckp.offset, p);
+	if (sp->st_time_ckp == 0)
 		printf("0\tNo checkpoint timestamp.\n");
 	else
 		printf("%.24s\tCheckpoint timestamp.\n",
-		    ctime(&tstat->st_time_ckp));
+		    ctime(&sp->st_time_ckp));
 	printf("%lx\tLast transaction ID allocated.\n",
-	    (u_long)tstat->st_last_txnid);
-	printf("%lu\tMaximum number of active transactions.\n",
-	    (u_long)tstat->st_maxtxns);
-	printf("%lu\tNumber of transactions begun.\n",
-	    (u_long)tstat->st_nbegins);
-	printf("%lu\tNumber of transactions aborted.\n",
-	    (u_long)tstat->st_naborts);
-	printf("%lu\tNumber of transactions committed.\n",
-	    (u_long)tstat->st_ncommits);
-	printf("%lu\tActive transactions.\n", (u_long)tstat->st_nactive);
-	qsort(tstat->st_txnarray,
-	    tstat->st_nactive, sizeof(tstat->st_txnarray[0]), txn_compare);
-	for (i = 0; i < tstat->st_nactive; ++i)
+	    (u_long)sp->st_last_txnid);
+	dl("Maximum number of active transactions.\n", (u_long)sp->st_maxtxns);
+	dl("Number of transactions begun.\n", (u_long)sp->st_nbegins);
+	dl("Number of transactions aborted.\n", (u_long)sp->st_naborts);
+	dl("Number of transactions committed.\n", (u_long)sp->st_ncommits);
+	dl("The number of region locks granted without waiting.\n",
+	    (u_long)sp->st_region_nowait);
+	dl("The number of region locks granted after waiting.\n",
+	    (u_long)sp->st_region_wait);
+	dl("Active transactions.\n", (u_long)sp->st_nactive);
+	qsort(sp->st_txnarray,
+	    sp->st_nactive, sizeof(sp->st_txnarray[0]), txn_compare);
+	for (i = 0; i < sp->st_nactive; ++i)
 		printf("\tid: %lx; initial LSN file/offest %lu/%lu\n",
-		    (u_long)tstat->st_txnarray[i].txnid,
-		    (u_long)tstat->st_txnarray[i].lsn.file,
-		    (u_long)tstat->st_txnarray[i].lsn.offset);
+		    (u_long)sp->st_txnarray[i].txnid,
+		    (u_long)sp->st_txnarray[i].lsn.file,
+		    (u_long)sp->st_txnarray[i].lsn.offset);
 }
 
 int
@@ -417,25 +485,41 @@ txn_compare(a1, b1)
 }
 
 /*
+ * dl --
+ *	Display a big value.
+ */
+void
+dl(msg, value)
+	const char *msg;
+	u_long value;
+{
+	/*
+	 * Two formats: if less than 10 million, display as the number, if
+	 * greater than 10 million display as ###M.
+	 */
+	if (value < 10000000)
+		printf("%lu\t%s", value, msg);
+	else
+		printf("%luM\t%s", value / 1000000, msg);
+}
+
+/*
  * prflags --
  *	Print out flag values.
  */
 void
-prflags(flags, fn)
+prflags(flags, fnp)
 	u_int32_t flags;
-	FN const *fn;
-{
 	const FN *fnp;
-	int found;
+{
 	const char *sep;
 
 	sep = " ";
 	printf("Flags:");
-	for (found = 0, fnp = fn; fnp->mask != 0; ++fnp)
+	for (; fnp->mask != 0; ++fnp)
 		if (fnp->mask & flags) {
 			printf("%s%s", sep, fnp->name);
 			sep = ", ";
-			found = 1;
 		}
 	printf("\n");
 }
@@ -450,7 +534,7 @@ db_init(home, ttype)
 	test_t ttype;
 {
 	DB_ENV *dbenv;
-	int flags;
+	u_int32_t flags;
 
 	if ((dbenv = (DB_ENV *)malloc(sizeof(DB_ENV))) == NULL) {
 		errno = ENOMEM;
@@ -467,13 +551,16 @@ db_init(home, ttype)
 	switch (ttype) {
 	case T_DB:
 	case T_MPOOL:
-		flags |= DB_INIT_MPOOL;
+		LF_SET(DB_INIT_MPOOL);
+		break;
+	case T_LOCK:
+		LF_SET(DB_INIT_LOCK);
 		break;
 	case T_LOG:
-		flags |= DB_INIT_LOG;
+		LF_SET(DB_INIT_LOG);
 		break;
 	case T_TXN:
-		flags |= DB_INIT_TXN;
+		LF_SET(DB_INIT_TXN);
 		break;
 	case T_NOTSET:
 		abort();
@@ -493,7 +580,7 @@ db_init(home, ttype)
 
 	/* Turn off the DB_INIT_MPOOL flag if it's a database. */
 	if (ttype == T_DB)
-		flags &= ~DB_INIT_MPOOL;
+		LF_CLR(DB_INIT_MPOOL);
 
 	/* Set the error output options -- this time we want a message. */
 	memset(dbenv, 0, sizeof(*dbenv));
@@ -508,6 +595,21 @@ db_init(home, ttype)
 }
 
 /*
+ * argcheck --
+ *	Return if argument flags are okay.
+ */
+int
+argcheck(arg, ok_args)
+	char *arg;
+	const char *ok_args;
+{
+	for (; *arg != '\0'; ++arg)
+		if (strchr(ok_args, *arg) == NULL)
+			return (0);
+	return (1);
+}
+
+/*
  * oninit --
  *	Interrupt signal handler.
  */
@@ -523,6 +625,7 @@ onint(signo)
 void
 usage()
 {
-	fprintf(stderr, "usage: db_stat [-mlt] [-d file] [-h home]\n");
+	fprintf(stderr,
+    "usage: db_stat [-clmNt] [-C Acflmo] [-d file] [-h home] [-M Ahlm]\n");
 	exit (1);
 }