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.

1 files changed, 68 insertions, 45 deletions

diff --git a/db2/db/db.c b/db2/db/db.c
index 8df76349d1..9951ebd944 100644
--- a/db2/db/db.c
+++ b/db2/db/db.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.
  */
 /*
@@ -44,20 +44,16 @@
 #include "config.h"
 
 #ifndef lint
-static const char sccsid[] = "@(#)db.c	10.45 (Sleepycat) 12/4/97";
+static const char sccsid[] = "@(#)db.c	10.57 (Sleepycat) 5/7/98";
 #endif /* not lint */
 
 #ifndef NO_SYSTEM_INCLUDES
 #include <sys/types.h>
-#include <sys/stat.h>
 
 #include <errno.h>
-#include <fcntl.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #endif
 
 #include "db_int.h"
@@ -71,7 +67,7 @@ static const char sccsid[] = "@(#)db.c	10.45 (Sleepycat) 12/4/97";
 #include "db_am.h"
 #include "common_ext.h"
 
-static int db_close __P((DB *, int));
+static int db_close __P((DB *, u_int32_t));
 static int db_fd __P((DB *, int *));
 
 /*
@@ -99,7 +95,8 @@ int
 db_open(fname, type, flags, mode, dbenv, dbinfo, dbpp)
 	const char *fname;
 	DBTYPE type;
-	int flags, mode;
+	u_int32_t flags;
+	int mode;
 	DB_ENV *dbenv;
 	DB_INFO *dbinfo;
 	DB **dbpp;
@@ -108,6 +105,7 @@ db_open(fname, type, flags, mode, dbenv, dbinfo, dbpp)
 	DB *dbp;
 	DBT pgcookie;
 	DB_ENV *envp, t_dbenv;
+	DB_MPOOL_FINFO finfo;
 	DB_PGINFO pginfo;
 	HASHHDR *hashm;
 	size_t cachesize;
@@ -125,10 +123,26 @@ db_open(fname, type, flags, mode, dbenv, dbinfo, dbpp)
 	if ((ret = __db_fchk(dbenv, "db_open", flags, OKFLAGS)) != 0)
 		return (ret);
 
-	if (dbenv != NULL &&
-	    LF_ISSET(DB_THREAD) && !F_ISSET(dbenv, DB_ENV_THREAD)) {
-		__db_err(dbenv, "environment not created using DB_THREAD");
-		return (EINVAL);
+	if (dbenv != NULL) {
+		/*
+		 * You can't specify threads during the db_open() if the
+		 * environment wasn't configured with them.
+		 */
+		if (LF_ISSET(DB_THREAD) && !F_ISSET(dbenv, DB_ENV_THREAD)) {
+			__db_err(dbenv,
+			    "environment not created using DB_THREAD");
+			return (EINVAL);
+		}
+
+		/*
+		 * Specifying a cachesize to db_open(3), after creating an
+		 * environment, is a common mistake.
+		 */
+		if (dbinfo != NULL && dbinfo->db_cachesize != 0) {
+			__db_err(dbenv,
+			    "cachesize will be ignored if environment exists");
+			return (EINVAL);
+		}
 	}
 
 	/* Initialize for error return. */
@@ -203,7 +217,7 @@ db_open(fname, type, flags, mode, dbenv, dbinfo, dbpp)
 
 	/* Fill in the default file mode. */
 	if (mode == 0)
-		mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP;
+		mode = __db_omode("rwrw--");
 
 	/* Check if the user wants us to swap byte order. */
 	if (dbinfo != NULL)
@@ -230,7 +244,7 @@ db_open(fname, type, flags, mode, dbenv, dbinfo, dbpp)
 	if (fname != NULL && fname[0] != '\0') {
 		/* Get the real file name. */
 		if ((ret = __db_appname(dbenv,
-		     DB_APP_DATA, NULL, fname, NULL, &real_name)) != 0)
+		     DB_APP_DATA, NULL, fname, 0, NULL, &real_name)) != 0)
 			goto err;
 
 		/*
@@ -455,22 +469,6 @@ empty:	/*
 	}
 
 	/*
-	 * Set and/or correct the cache size; must be a multiple of the
-	 * page size.
-	 */
-	if (dbinfo == NULL || dbinfo->db_cachesize == 0)
-		cachesize = dbp->pgsize * DB_MINCACHE;
-	else {
-		cachesize = dbinfo->db_cachesize;
-		if (cachesize & (dbp->pgsize - 1))
-			cachesize += (~cachesize & (dbp->pgsize - 1)) + 1;
-		if (cachesize < dbp->pgsize * DB_MINCACHE)
-			cachesize = dbp->pgsize * DB_MINCACHE;
-		if (cachesize < 20 * 1024)
-			cachesize = 20 * 1024;
-	}
-
-	/*
 	 * If no mpool supplied by the application, attach to a local,
 	 * created buffer pool.
 	 *
@@ -499,10 +497,28 @@ empty:	/*
 			envp = dbenv;
 			restore = 1;
 		}
+
+		/*
+		 * Set and/or correct the cache size; must be a multiple of
+		 * the page size.
+		 */
+		if (dbinfo == NULL || dbinfo->db_cachesize == 0)
+			cachesize = dbp->pgsize * DB_MINCACHE;
+		else {
+			cachesize = dbinfo->db_cachesize;
+			if (cachesize & (dbp->pgsize - 1))
+				cachesize +=
+				    (~cachesize & (dbp->pgsize - 1)) + 1;
+			if (cachesize < dbp->pgsize * DB_MINCACHE)
+				cachesize = dbp->pgsize * DB_MINCACHE;
+			if (cachesize < 20 * 1024)
+				cachesize = 20 * 1024;
+		}
 		envp->mp_size = cachesize;
+
 		if ((ret = memp_open(NULL, DB_CREATE | DB_MPOOL_PRIVATE |
 		    (F_ISSET(dbp, DB_AM_THREAD) ? DB_THREAD : 0),
-		    S_IRUSR | S_IWUSR, envp, &dbp->mp)) != 0)
+		    __db_omode("rw----"), envp, &dbp->mp)) != 0)
 			goto err;
 		if (restore)
 			*dbenv = t_dbenv;
@@ -566,9 +582,18 @@ empty:	/*
 	pgcookie.data = &pginfo;
 	pgcookie.size = sizeof(DB_PGINFO);
 
-	if ((ret = memp_fopen(dbp->mp, fname, ftype,
-	    F_ISSET(dbp, DB_AM_RDONLY) ? DB_RDONLY : 0, 0, dbp->pgsize,
-	    0, &pgcookie, dbp->lock.fileid, &dbp->mpf)) != 0)
+	/*
+	 * Set up additional memp_fopen information.
+	 */
+	memset(&finfo, 0, sizeof(finfo));
+	finfo.ftype = ftype;
+	finfo.pgcookie = &pgcookie;
+	finfo.fileid = dbp->lock.fileid;
+	finfo.lsn_offset = 0;
+	finfo.clear_len = DB_PAGE_CLEAR_LEN;
+	if ((ret = memp_fopen(dbp->mp, fname,
+	    F_ISSET(dbp, DB_AM_RDONLY) ? DB_RDONLY : 0,
+	    0, dbp->pgsize, &finfo, &dbp->mpf)) != 0)
 		goto err;
 
 	/*
@@ -673,7 +698,7 @@ err:	/* Close the file descriptor. */
 static int
 db_close(dbp, flags)
 	DB *dbp;
-	int flags;
+	u_int32_t flags;
 {
 	DBC *dbc;
 	DB *tdbp;
@@ -734,7 +759,7 @@ db_close(dbp, flags)
 	}
 
 	/* Sync the memory pool. */
-	if ((t_ret = memp_fsync(dbp->mpf)) != 0 &&
+	if (!LF_ISSET(DB_NOSYNC) && (t_ret = memp_fsync(dbp->mpf)) != 0 &&
 	    t_ret != DB_INCOMPLETE && ret == 0)
 		ret = t_ret;
 
@@ -796,18 +821,11 @@ db_fd(dbp, fdp)
         DB *dbp;
 	int *fdp;
 {
-	/* In-memory database can't have a file descriptor. */
-	if (F_ISSET(dbp, DB_AM_INMEM))
-		return (ENOENT);
-
 	/*
 	 * XXX
-	 * Truly spectacular layering violation.  As we don't open the
-	 * underlying file until we need it, it may not be initialized.
+	 * Truly spectacular layering violation.
 	 */
-	if ((*fdp = dbp->mpf->fd) == -1)
-		return (ENOENT);
-	return (0);
+	return (__mp_xxx_fd(dbp->mpf, fdp));
 }
 
 /*
@@ -821,6 +839,11 @@ __db_pgerr(dbp, pgno)
 	DB *dbp;
 	db_pgno_t pgno;
 {
+	/*
+	 * Three things are certain:
+	 * Death, taxes, and lost data.
+	 * Guess which has occurred.
+	 */
 	__db_err(dbp->dbenv,
 	    "unable to create/retrieve page %lu", (u_long)pgno);
 	return (__db_panic(dbp));