Update.cvs/libc-ud-970827

1997-08-10 19:17  Philip Blundell  <Philip.Blundell@pobox.com>

	* nss/nss_db/db-XXX.c: Include <db_185.h> not <db.h>.  Somebody
	should update this to use the new db API.
	* nss/nss_db/db-netgrp.c: Likewise.
	* nss/nss_db/db-alias.c: Likewise.
	* db2/Makefile: Makefile for db-2.x in glibc.

1997-08-27 21:20  Ulrich Drepper  <drepper@cygnus.com>

	* csu/Makefile (before-compile): New goal.  Make sure abi-tag.h
	is generated.
	[$(elf)=yes] (asm-CPPFLAGS): Make sure abi-tag.h file can be found.

	* Makeconfig [$(build-omitfp)=yes] (CFLAGS-.o): Add
	-D__USE_STRING_INLINES.
	* string/string.f: Move strnlen optimization after inclusion of
	<bits/string.h>.  Include <bits/string.h> only if __USE_STRING_INLINES
	is defined.
	* sysdeps/generic/memcpy.c: Undef memcpy to allow macro of this name
	in <bits/string.h>.
	* sysdeps/generic/memset.c: Likewise.
	* sysdeps/i386/string.h: i386 optimized string functions.
	* sysdeps/i386/i486string.h: i486+ optimized string functions.

	* Makefile (subdirs): Change db to db2.
	* shlib-versions: Bump libdb verion number to 3.
	* include/db.h: Include from db2 directory.
	* include/db_185.h: New file.
	* sysdeps/i386/Makefile [$(subdirs)=db2] (CPPFLAGS): Add macros
	to provide spinlock information for db2.
	* sysdeps/m68k/m68020/Makefile: New file.  Likewise.
	* sysdeps/sparc/Makefile: New file.  Likewise.
	* sysdeps/unix/sysv/linux/Makefile [$(subdirs)=db2] (CPPFLAGS):
	Add -DHAVE_LLSEEK.
	* db2/config.h: Hand-edited config file for db2 in glibc.
	* db2/compat.h: New file from db-2.3.4.
	* db2/db.h: Likewise.
	* db2/db_185.h: Likewise.
	* db2/db_int.h: Likewise.
	* db2/makedb.c: Likewise.
	* db2/btree/bt_close.c: Likewise.
	* db2/btree/bt_compare.c: Likewise.
	* db2/btree/bt_conv.c: Likewise.
	* db2/btree/bt_cursor.c: Likewise.
	* db2/btree/bt_delete.c: Likewise.
	* db2/btree/bt_open.c: Likewise.
	* db2/btree/bt_page.c: Likewise.
	* db2/btree/bt_put.c: Likewise.
	* db2/btree/bt_rec.c: Likewise.
	* db2/btree/bt_recno.c: Likewise.
	* db2/btree/btree_auto.c: Likewise.
	* db2/btree/bt_rsearch.c: Likewise.
	* db2/btree/bt_search.c: Likewise.
	* db2/btree/bt_split.c: Likewise.
	* db2/btree/bt_stat.c: Likewise.
	* db2/btree/btree.src: Likewise.
	* db2/common/db_appinit.c: Likewise.
	* db2/common/db_err.c: Likewise.
	* db2/common/db_byteorder.c: Likewise.
	* db2/common/db_apprec.c: Likewise.
	* db2/common/db_salloc.c: Likewise.
	* db2/common/db_log2.c: Likewise.
	* db2/common/db_region.c: Likewise.
	* db2/common/db_shash.c: Likewise.
	* db2/db/db.c: Likewise.
	* db2/db/db.src: Likewise.
	* db2/db/db_conv.c: Likewise.
	* db2/db/db_dispatch.c: Likewise.
	* db2/db/db_dup.c: Likewise.
	* db2/db/db_overflow.c: Likewise.
	* db2/db/db_pr.c: Likewise.
	* db2/db/db_rec.c: Likewise.
	* db2/db/db_ret.c: Likewise.
	* db2/db/db_thread.c: Likewise.
	* db2/db/db_auto.c: Likewise.
	* db2/db185/db185.c: Likewise.
	* db2/db185/db185_int.h: Likewise.
	* db2/dbm/dbm.c: Likewise.
	* db2/hash/hash.c: Likewise.
	* db2/hash/hash.src: Likewise.
	* db2/hash/hash_page.c: Likewise.
	* db2/hash/hash_conv.c: Likewise.
	* db2/hash/hash_debug.c: Likewise.
	* db2/hash/hash_stat.c: Likewise.
	* db2/hash/hash_rec.c: Likewise.
	* db2/hash/hash_dup.c: Likewise.
	* db2/hash/hash_func.c: Likewise.
	* db2/hash/hash_auto.c: Likewise.
	* db2/include/mp.h: Likewise.
	* db2/include/btree.h: Likewise.
	* db2/include/db.h.src: Likewise.
	* db2/include/db_int.h.src: Likewise.
	* db2/include/db_shash.h: Likewise.
	* db2/include/db_swap.h: Likewise.
	* db2/include/db_185.h.src: Likewise.
	* db2/include/txn.h: Likewise.
	* db2/include/db_am.h: Likewise.
	* db2/include/shqueue.h: Likewise.
	* db2/include/hash.h: Likewise.
	* db2/include/db_dispatch.h: Likewise.
	* db2/include/lock.h: Likewise.
	* db2/include/db_page.h: Likewise.
	* db2/include/log.h: Likewise.
	* db2/include/db_auto.h: Likewise.
	* db2/include/btree_auto.h: Likewise.
	* db2/include/hash_auto.h: Likewise.
	* db2/include/log_auto.h: Likewise.
	* db2/include/txn_auto.h: Likewise.
	* db2/include/db_ext.h: Likewise.
	* db2/include/btree_ext.h: Likewise.
	* db2/include/clib_ext.h: Likewise.
	* db2/include/common_ext.h: Likewise.
	* db2/include/hash_ext.h: Likewise.
	* db2/include/lock_ext.h: Likewise.
	* db2/include/log_ext.h: Likewise.
	* db2/include/mp_ext.h: Likewise.
	* db2/include/mutex_ext.h: Likewise.
	* db2/include/os_ext.h: Likewise.
	* db2/include/txn_ext.h: Likewise.
	* db2/include/cxx_int.h: Likewise.
	* db2/include/db_cxx.h: Likewise.
	* db2/include/queue.h: Likewise.
	* db2/lock/lock.c: Likewise.
	* db2/lock/lock_conflict.c: Likewise.
	* db2/lock/lock_util.c: Likewise.
	* db2/lock/lock_deadlock.c: Likewise.
	* db2/log/log.c: Likewise.
	* db2/log/log_get.c: Likewise.
	* db2/log/log.src: Likewise.
	* db2/log/log_compare.c: Likewise.
	* db2/log/log_put.c: Likewise.
	* db2/log/log_rec.c: Likewise.
	* db2/log/log_archive.c: Likewise.
	* db2/log/log_register.c: Likewise.
	* db2/log/log_auto.c: Likewise.
	* db2/log/log_findckp.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_region.c: Likewise.
	* db2/mp/mp_pr.c: Likewise.
	* db2/mp/mp_sync.c: Likewise.
	* db2/mutex/68020.gcc: Likewise.
	* db2/mutex/mutex.c: Likewise.
	* db2/mutex/README: Likewise.
	* db2/mutex/x86.gcc: Likewise.
	* db2/mutex/sparc.gcc: Likewise.
	* db2/mutex/uts4.cc.s: Likewise.
	* db2/mutex/alpha.dec: Likewise.
	* db2/mutex/alpha.gcc: Likewise.
	* db2/mutex/parisc.gcc: Likewise.
	* db2/mutex/parisc.hp: Likewise.
	* db2/os/db_os_abs.c: Likewise.
	* db2/os/db_os_dir.c: Likewise.
	* db2/os/db_os_fid.c: Likewise.
	* db2/os/db_os_lseek.c: Likewise.
	* db2/os/db_os_mmap.c: Likewise.
	* db2/os/db_os_open.c: Likewise.
	* db2/os/db_os_rw.c: Likewise.
	* db2/os/db_os_sleep.c: Likewise.
	* db2/os/db_os_stat.c: Likewise.
	* db2/os/db_os_unlink.c: Likewise.
	* db2/txn/txn.c: Likewise.
	* db2/txn/txn.src: Likewise.
	* db2/txn/txn_rec.c: Likewise.
	* db2/txn/txn_auto.c: Likewise.
	* db2/clib/getlong.c: Likewise.
	* db2/progs/db_archive/db_archive.c: Likewise.
	* db2/progs/db_checkpoint/db_checkpoint.c: Likewise.
	* db2/progs/db_deadlock/db_deadlock.c: Likewise.
	* db2/progs/db_dump/db_dump.c: Likewise.
	* db2/progs/db_dump185/db_dump185.c: Likewise.
	* db2/progs/db_load/db_load.c: Likewise.
	* db2/progs/db_printlog/db_printlog.c: Likewise.
	* db2/progs/db_recover/db_recover.c: Likewise.
	* db2/progs/db_stat/db_stat.c: Likewise.

	* libio/stdio.h [__cplusplus] (__STDIO_INLINE): Define as inline.

	* po/de.po, po/sv.po: Update from 2.0.5 translations.

	* sysdeps/unix/sysv/linux/netinet/tcp.h: Pretty print.

	* sunrpc/rpc/xdr.h (XDR): Don't define argument of x_destroy callback
	as const.
	* sunrpc/xdr_mem.c (xdrmem_destroy): Don't define argument as const.
	* sunrpx/xdr_rec.c (xdrrec_destroy): Likewise.
	* sunrpx/xdr_stdio.c (xdrstdio_destroy): Likewise.

1997-08-27 18:47  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/if_index.c: Include <errno.h>.
	Reported by Benjamin Kosnik <bkoz@cygnus.com>.

1997-08-27 02:27  Roland McGrath  <roland@baalperazim.frob.com>

	* abi-tags: New file.
	* csu/Makefile (distribute): Remove abi-tag.h.
	($(objpfx)abi-tag.h): New target.
	* Makefile (distribute): Add abi-tags.
	* sysdeps/unix/sysv/linux/abi-tag.h: File removed.
	* sysdeps/mach/hurd/abi-tag.h: File removed.
	* sysdeps/stub/abi-tag.h: File removed.

1997-08-25  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/unix/make-syscalls.sh: Change output so that it
	generates compilation rules only for the currently selected object
	suffixes.

1997-08-25  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/m68k/dl-machine.h (RTLD_START): Switch back to previous
	section to avoid confusing the compiler.
	* sysdeps/alpha/dl-machine.h (RTLD_START): Likewise.
	* sysdeps/i386/dl-machine.h (RTLD_START): Likewise.
	* sysdeps/mips/dl-machine.h (RTLD_START): Likewise.
	* sysdeps/mips/mips64/dl-machine.h (RTLD_START): Likewise.
	* sysdeps/sparc/sparc32/dl-machine.h (RTLD_START): Likewise.

	* sysdeps/m68k/dl-machine.h (elf_machine_load_address): Use a GOT
	relocation instead of a constant to avoid text relocation.
	(ELF_MACHINE_BEFORE_RTLD_RELOC): Removed.
	(RTLD_START): Declare global labels as functions and add size
	directive.

1997-08-25 17:01  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/i386/bits/select.h: Correct assembler versions to work even
	for descriptors >= 32.

	* stdlib/alloca.h: Don't define alloca to __alloca since if gcc
	is used __alloca is not defined to __builtin_alloca and so might
	not be available.
	Reported by Uwe Ohse <uwe@ohse.de>.

	* sysdeps/unix/sysv/linux/sys/sysmacros.h: Define macros in a special
	way if gcc is not used and so dev_t is an array.
	Reported by Uwe Ohse <uwe@ohse.de>.

1997-08-23  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* manual/libc.texinfo: Reorder chapters to match logical order.

1997-08-25 12:22  Ulrich Drepper  <drepper@cygnus.com>

	* sunrpc/rpc/xdr.h: Change name of parameters in prototypes of
	xdr_reference, xdrmem_create, and xdrstdio_create because of clash
	with g++ internal symbols.
	Patch by Sudish Joseph <sj@eng.mindspring.net>.

	* elf/dl-deps.c: Implement handling of DT_FILTER.

1 files changed, 484 insertions, 0 deletions

diff --git a/db2/log/log_put.c b/db2/log/log_put.c
new file mode 100644
index 0000000000..db31f9b0e1
--- /dev/null
+++ b/db2/log/log_put.c
@@ -0,0 +1,484 @@
+/*-
+ * See the file LICENSE for redistribution information.
+ *
+ * Copyright (c) 1996, 1997
+ *	Sleepycat Software.  All rights reserved.
+ */
+#include "config.h"
+
+#ifndef lint
+static const char sccsid[] = "@(#)log_put.c	10.12 (Sleepycat) 8/20/97";
+#endif /* not lint */
+
+#ifndef NO_SYSTEM_INCLUDES
+#include <sys/types.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+#endif
+
+#include "db_int.h"
+#include "shqueue.h"
+#include "db_page.h"
+#include "log.h"
+#include "hash.h"
+#include "common_ext.h"
+
+static int __log_fill __P((DB_LOG *, void *, u_int32_t));
+static int __log_newfd __P((DB_LOG *));
+static int __log_write __P((DB_LOG *, void *, u_int32_t));
+static int __log_putr __P((DB_LOG *, const DBT *, u_int32_t));
+
+/*
+ * log_put --
+ *	Write a log record.
+ */
+int
+log_put(dblp, lsn, dbt, flags)
+	DB_LOG *dblp;
+	DB_LSN *lsn;
+	const DBT *dbt;
+	int flags;
+{
+	int ret;
+
+	/* Validate arguments. */
+#define	OKFLAGS	(DB_CHECKPOINT | DB_FLUSH)
+	if (flags != 0) {
+		if ((ret =
+		    __db_fchk(dblp->dbenv, "log_put", flags, OKFLAGS)) != 0)
+			return (ret);
+		switch (flags) {
+		case DB_CHECKPOINT:
+		case DB_FLUSH:
+		case 0:
+			break;
+		default:
+			return (__db_ferr(dblp->dbenv, "log_put", 1));
+		}
+	}
+
+	LOCK_LOGREGION(dblp);
+
+	ret = __log_put(dblp, lsn, dbt, flags);
+
+	UNLOCK_LOGREGION(dblp);
+
+	return (ret);
+}
+
+/*
+ * __log_put --
+ *	Write a log record; internal version.
+ *
+ * PUBLIC: int __log_put __P((DB_LOG *, DB_LSN *, const DBT *, int));
+ */
+int
+__log_put(dblp, lsn, dbt, flags)
+	DB_LOG *dblp;
+	DB_LSN *lsn;
+	const DBT *dbt;
+	int flags;
+{
+	DBT t;
+	DBT fid_dbt;
+	DB_LSN r_unused;
+	FNAME *fnp;
+	LOG *lp;
+	u_int32_t lastoff;
+	int ret;
+
+	lp = dblp->lp;
+
+	/* If this information won't fit in the file, swap files. */
+	if (lp->lsn.offset + sizeof(HDR) + dbt->size > lp->persist.lg_max) {
+		if (sizeof(HDR) +
+		    sizeof(LOGP) + dbt->size > lp->persist.lg_max) {
+			__db_err(dblp->dbenv,
+			    "log_put: record larger than maximum file size");
+			return (EINVAL);
+		}
+		if (lp->b_off != 0) {
+			if ((ret = __log_write(dblp, lp->buf, lp->b_off)) != 0)
+				return (ret);
+			if ((ret = __db_fsync(dblp->lfd)) != 0)
+				return (ret);
+			lp->s_lsn.file = lp->lsn.file;
+			lp->s_lsn.offset = lp->lsn.offset - 1;
+		}
+
+		/*
+		 * Save the last known offset from the previous file, we'll
+		 * need it to initialize the persistent header information.
+		 */
+		lastoff = lp->lsn.offset;
+
+		++lp->lsn.file;
+		lp->lsn.offset = 0;
+		lp->w_off = 0;
+	} else
+		lastoff = 0;
+
+	/*
+	 * Insert persistent information as the first record in every file.
+	 * Note that the previous length is wrong for the very first record
+	 * of the log, but that's okay, we check for it during retrieval.
+	 */
+	if (lp->lsn.offset == 0) {
+		t.data = &lp->persist;
+		t.size = sizeof(LOGP);
+		if ((ret = __log_putr(dblp,
+		    &t, lastoff == 0 ? 0 : lastoff - lp->len)) != 0)
+			return (ret);
+	}
+
+	/* Initialize the LSN information returned to the user. */
+	lsn->file = lp->lsn.file;
+	lsn->offset = lp->lsn.offset;
+
+	/* Put out the user's record. */
+	if ((ret = __log_putr(dblp, dbt, lp->lsn.offset - lp->len)) != 0)
+		return (ret);
+
+	/*
+	 * On a checkpoint, we:
+	 *	Put out the checkpoint record (above).
+	 *	Save the LSN of the checkpoint in the shared region.
+	 *	Append the set of file name information into the log.
+	 *	Flush the current buffer contents to disk.
+	 *	Sync the log to disk.
+	 *	Save the time the checkpoint was written.
+	 *	Reset the bytes written since the last checkpoint.
+	 */
+	if (flags == DB_CHECKPOINT) {
+		lp->c_lsn = *lsn;
+
+		for (fnp = SH_TAILQ_FIRST(&dblp->lp->fq, __fname);
+		    fnp != NULL; fnp = SH_TAILQ_NEXT(fnp, q, __fname)) {
+			t.data = ADDR(dblp, fnp->name_off);
+			t.size = strlen(t.data) + 1;
+			memset(&fid_dbt, 0, sizeof(fid_dbt));
+			fid_dbt.data = ADDR(dblp, fnp->fileid_off);
+			fid_dbt.size = DB_FILE_ID_LEN;
+			if ((ret = __log_register_log(dblp, NULL, &r_unused,
+			    0, &t, &fid_dbt, fnp->id, fnp->s_type)) != 0)
+				return (ret);
+		}
+		if (lp->b_off != 0 &&
+		    (ret = __log_write(dblp, lp->buf, lp->b_off)) != 0)
+			return (ret);
+		(void)time(&lp->chkpt);
+		lp->written = 0;
+
+		if ((ret = __db_fsync(dblp->lfd)) != 0)
+			return (ret);
+		lp->s_lsn.file = lp->lsn.file;
+		lp->s_lsn.offset = lp->lsn.offset - 1;
+	}
+
+	/* We always flush on a checkpoint. */
+	if (flags == DB_FLUSH || flags == DB_CHECKPOINT) {
+		if (lp->b_off != 0 &&
+		    (ret = __log_write(dblp, lp->buf, lp->b_off)) != 0)
+			return (ret);
+
+		if ((ret = __db_fsync(dblp->lfd)) != 0)
+			return (ret);
+		lp->s_lsn.file = lp->lsn.file;
+		lp->s_lsn.offset = lp->lsn.offset - 1;
+	}
+
+	/*
+	 * If we just did I/O, i.e., this LSN could have spanned the start of
+	 * the in-core buffer, we remember it so that we can flush correctly
+	 * during a sync.
+	 */
+	if (lsn->offset < lp->w_off && lsn->offset + lp->len > lp->w_off)
+		lp->span_lsn = *lsn;
+	return (0);
+}
+
+/*
+ * __log_putr --
+ *	Actually put a record into the log.
+ */
+static int
+__log_putr(dblp, dbt, prev)
+	DB_LOG *dblp;
+	const DBT *dbt;
+	u_int32_t prev;
+{
+	HDR hdr;
+	LOG *lp;
+	int ret;
+
+	lp = dblp->lp;
+
+	/*
+	 * Initialize the header.  If we just switched files, lsn.offset will
+	 * be 0, and what we really want is the offset of the previous record
+	 * in the previous file.  Fortunately, prev holds the value we want.
+	 */
+	hdr.prev = prev;
+	hdr.len = sizeof(HDR) + dbt->size;
+	hdr.cksum = __ham_func4(dbt->data, dbt->size);
+
+	if ((ret = __log_fill(dblp, &hdr, sizeof(HDR))) != 0)
+		return (ret);
+	lp->lsn.offset += sizeof(HDR);
+
+	if ((ret = __log_fill(dblp, dbt->data, dbt->size)) != 0)
+		return (ret);
+	lp->lsn.offset += dbt->size;
+
+	lp->len = sizeof(HDR) + dbt->size;
+	return (0);
+}
+
+/*
+ * log_flush --
+ *	Write all records less than or equal to the specified LSN.
+ */
+int
+log_flush(dblp, lsn)
+	DB_LOG *dblp;
+	const DB_LSN *lsn;
+{
+	DB_LSN t_lsn;
+	LOG *lp;
+	int ret;
+
+	ret = 0;
+	lp = dblp->lp;
+
+	LOCK_LOGREGION(dblp);
+
+	/* If no LSN specified, flush the entire log. */
+	if (lsn == NULL) {
+		t_lsn.file = lp->lsn.file;
+		t_lsn.offset = lp->lsn.offset - lp->len;
+		lsn = &t_lsn;
+	}
+
+	/* If it's a non-existent record, it's an error. */
+	if (lsn->file > lp->lsn.file ||
+	    (lsn->file == lp->lsn.file && lsn->offset > lp->lsn.offset)) {
+		__db_err(dblp->dbenv, "log_flush: LSN past current end-of-log");
+		ret = EINVAL;
+		goto ret1;
+	}
+
+	/*
+	 * If it's from a previous file, we're done because we sync each
+	 * file when we move to a new one.
+	 */
+	if (lsn->file < lp->lsn.file)
+		goto ret1;
+
+	/*
+	 * If it's less than the last-sync'd offset, we've already sync'd
+	 * this LSN.
+	 */
+	if (lsn->offset <= lp->s_lsn.offset)
+		goto ret1;
+
+	/*
+	 * We may need to write the current buffer.  We have to write the
+	 * current buffer if the sync LSN is greater than or equal to the
+	 * saved spanning-LSN.
+	 */
+	if (lsn->file >= lp->span_lsn.file &&
+	    lsn->offset >= lp->span_lsn.offset)
+		if ((ret = __log_write(dblp, lp->buf, lp->b_off)) != 0)
+			goto ret1;
+
+	/* Acquire a file descriptor if we don't have one. */
+	if (dblp->lfname != dblp->lp->lsn.file &&
+	    (ret = __log_newfd(dblp)) != 0)
+		goto ret1;
+
+	if ((ret = __db_fsync(dblp->lfd)) != 0)
+		goto ret1;
+
+	lp->s_lsn.file = lp->lsn.file;
+	lp->s_lsn.offset = lsn->offset;
+
+ret1:	UNLOCK_LOGREGION(dblp);
+	return (ret);
+}
+
+/*
+ * __log_fill --
+ *	Write information into the log.
+ */
+static int
+__log_fill(dblp, addr, len)
+	DB_LOG *dblp;
+	void *addr;
+	u_int32_t len;
+{
+	LOG *lp;
+	u_int32_t nrec;
+	size_t nw, remain;
+	int ret;
+
+	/* Copy out the data. */
+	for (lp = dblp->lp; len > 0;) {
+		/*
+		 * If we're on a buffer boundary and the data is big enough,
+		 * copy as many records as we can directly from the data.
+		 */
+		if (lp->b_off == 0 && len >= sizeof(lp->buf)) {
+			nrec = len / sizeof(lp->buf);
+			if ((ret = __log_write(dblp,
+			    addr, nrec * sizeof(lp->buf))) != 0)
+				return (ret);
+			addr = (u_int8_t *)addr + nrec * sizeof(lp->buf);
+			len -= nrec * sizeof(lp->buf);
+			continue;
+		}
+
+		/* Figure out how many bytes we can copy this time. */
+		remain = sizeof(lp->buf) - lp->b_off;
+		nw = remain > len ? len : remain;
+		memcpy(lp->buf + lp->b_off, addr, nw);
+		addr = (u_int8_t *)addr + nw;
+		len -= nw;
+		lp->b_off += nw;
+
+		/* If we fill the buffer, flush it. */
+		if (lp->b_off == sizeof(lp->buf) &&
+		    (ret = __log_write(dblp, lp->buf, sizeof(lp->buf))) != 0)
+			return (ret);
+	}
+	return (0);
+}
+
+/*
+ * __log_write --
+ *	Write the log buffer to disk.
+ */
+static int
+__log_write(dblp, addr, len)
+	DB_LOG *dblp;
+	void *addr;
+	u_int32_t len;
+{
+	LOG *lp;
+	ssize_t nw;
+	int ret;
+
+	/*
+	 * If we haven't opened the log file yet or the current one
+	 * has changed, acquire a new log file.
+	 */
+	lp = dblp->lp;
+	if (dblp->lfd == -1 || dblp->lfname != lp->lsn.file)
+		if ((ret = __log_newfd(dblp)) != 0)
+			return (ret);
+
+	/*
+	 * Seek to the offset in the file (someone may have written it
+	 * since we last did).
+	 */
+	if ((ret = __db_lseek(dblp->lfd, 0, 0, lp->w_off, SEEK_SET)) != 0)
+		return (ret);
+	if ((ret = __db_write(dblp->lfd, addr, len, &nw)) != 0)
+		return (ret);
+	if (nw != (int32_t)len)
+		return (EIO);
+
+	/* Update the seek offset and reset the buffer offset. */
+	lp->b_off = 0;
+	lp->w_off += len;
+	lp->written += len;
+
+	return (0);
+}
+
+/*
+ * log_file --
+ *	Map a DB_LSN to a file name.
+ */
+int
+log_file(dblp, lsn, namep, len)
+	DB_LOG *dblp;
+	const DB_LSN *lsn;
+	char *namep;
+	size_t len;
+{
+	int ret;
+	char *p;
+
+	LOCK_LOGREGION(dblp);
+
+	ret = __log_name(dblp->dbenv, lsn->file, &p);
+
+	UNLOCK_LOGREGION(dblp);
+
+	if (ret != 0)
+		return (ret);
+
+	/* Check to make sure there's enough room and copy the name. */
+	if (len < strlen(p)) {
+		*namep = '\0';
+		return (ENOMEM);
+	}
+	(void)strcpy(namep, p);
+	free(p);
+
+	return (0);
+}
+
+/*
+ * __log_newfd --
+ *	Acquire a file descriptor for the current log file.
+ */
+static int
+__log_newfd(dblp)
+	DB_LOG *dblp;
+{
+	int ret;
+	char *p;
+
+	/* Close any previous file descriptor. */
+	if (dblp->lfd != -1) {
+		(void)__db_close(dblp->lfd);
+		dblp->lfd = -1;
+	}
+
+	/* Get the path of the new file and open it. */
+	dblp->lfname = dblp->lp->lsn.file;
+	if ((ret = __log_name(dblp->dbenv, dblp->lfname, &p)) != 0)
+		return (ret);
+	if ((ret = __db_fdopen(p,
+	    DB_CREATE | DB_SEQUENTIAL,
+	    DB_CREATE | DB_SEQUENTIAL,
+	    dblp->lp->persist.mode, &dblp->lfd)) != 0)
+		__db_err(dblp->dbenv,
+		    "log_put: %s: %s", p, strerror(errno));
+	FREES(p);
+	return (ret);
+}
+
+/*
+ * __log_name --
+ *	Return the log name for a particular file.
+ *
+ * PUBLIC: int __log_name __P((DB_ENV *, int, char **));
+ */
+int
+__log_name(dbenv, fn, np)
+	DB_ENV *dbenv;
+	int fn;
+	char **np;
+{
+	char name[sizeof(LFNAME) + 10];
+
+	(void)snprintf(name, sizeof(name), LFNAME, fn);
+	return (__db_appname(dbenv, DB_APP_LOG, NULL, name, NULL, np));
+}