[src/netbsd-1-5]: src/lib/libc/db Pull up file removal (requested by cgd):

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/08f4adf8ce42
branches:  netbsd-1-5
changeset: 490868:08f4adf8ce42
user:      he <he%NetBSD.org@localhost>
date:      Tue Mar 13 21:20:56 2001 +0000

description:
Pull up file removal (requested by cgd):
  Replace hcreate() / hsearch() / hdestroy() implementation with
  one that actually works as it's supposed to.

diffstat:

 lib/libc/db/hash/hsearch.c |  114 ---------------------------
 lib/libc/db/man/hcreate.3  |  189 ---------------------------------------------
 2 files changed, 0 insertions(+), 303 deletions(-)

diffs (truncated from 311 to 300 lines):

diff -r b2df384c3968 -r 08f4adf8ce42 lib/libc/db/hash/hsearch.c
--- a/lib/libc/db/hash/hsearch.c        Tue Mar 13 21:20:34 2001 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +0,0 @@
-/*     $NetBSD: hsearch.c,v 1.14 1999/02/16 18:23:00 kleink Exp $      */
-
-/*-
- * Copyright (c) 1990, 1993
- *     The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)hsearch.c  8.4 (Berkeley) 7/21/94";
-#else
-__RCSID("$NetBSD: hsearch.c,v 1.14 1999/02/16 18:23:00 kleink Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-
-#include <fcntl.h>
-#include <search.h>
-#include <string.h>
-
-#include <db.h>
-
-static DB *dbp = NULL;
-static ENTRY retval;
-
-extern int
-hcreate(nel)
-       size_t nel;
-{
-       HASHINFO info;
-
-       info.nelem = nel;
-       info.bsize = 256;
-       info.ffactor = 8;
-       info.cachesize = 0;
-       info.hash = NULL;
-       info.lorder = 0;
-       dbp = (DB *)__hash_open(NULL, O_CREAT | O_RDWR, 0600, &info, 0);
-       return (dbp != NULL);
-}
-
-extern ENTRY *
-hsearch(item, action)
-       ENTRY item;
-       ACTION action;
-{
-       DBT key, val;
-       int status;
-
-       if (!dbp)
-               return (NULL);
-       key.data = item.key;
-       key.size = strlen((char *)item.key) + 1;
-
-       if (action == ENTER) {
-               val.data = item.data;
-               val.size = strlen((char *)item.data) + 1;
-               status = (dbp->put)(dbp, &key, &val, R_NOOVERWRITE);
-               if (status)
-                       return (NULL);
-       } else {
-               /* FIND */
-               status = (dbp->get)(dbp, &key, &val, 0);
-               if (status)
-                       return (NULL);
-               else
-                       item.data = val.data;
-       }
-       retval.key = item.key;
-       retval.data = item.data;
-       return (&retval);
-}
-
-extern void
-hdestroy()
-{
-       if (dbp) {
-               (void)(dbp->close)(dbp);
-               dbp = NULL;
-       }
-}
diff -r b2df384c3968 -r 08f4adf8ce42 lib/libc/db/man/hcreate.3
--- a/lib/libc/db/man/hcreate.3 Tue Mar 13 21:20:34 2001 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,189 +0,0 @@
-.\"    $NetBSD: hcreate.3,v 1.3 1999/03/22 19:44:38 garbled Exp $
-.\"
-.\" Copyright (c) 1999 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Klaus Klein.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"        This product includes software developed by the NetBSD
-.\"        Foundation, Inc. and its contributors.
-.\" 4. Neither the name of The NetBSD Foundation nor the names of its
-.\"    contributors may be used to endorse or promote products derived
-.\"    from this software without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd February 16, 1999
-.Dt HCREATE 3
-.Os
-.Sh NAME
-.Nm hcreate ,
-.Nm hdestroy ,
-.Nm hsearch
-.Nd manage hash search table
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.Fd #include <search.h>
-.Ft int
-.Fn hcreate "size_t nel"
-.Ft void
-.Fn hdestroy "void"
-.Ft ENTRY *
-.Fn hsearch "ENTRY item" "ACTION action"
-.Sh DESCRIPTION
-The
-.Fn hcreate ,
-.Fn hdestroy
-and
-.Fn hsearch
-functions manage hash search tables.
-.Pp
-The
-.Fn hcreate
-function allocates and initializes the table.
-The
-.Fa nel
-argument specifies an estimate of the maximum number of entries to be held
-by the table.  Unless further memory allocation fails, supplying an
-insufficient
-.Fa nel
-value will not result in functional harm, although a performance degradation
-may occur.
-Initialization using the
-.Fn hcreate
-function is mandatory prior to any access operations using
-.Fn hsearch .
-.Pp
-The
-.Fn hdestroy
-function destroys a table previously created using
-.Fn hcreate .
-After a call to
-.Fn hdestroy ,
-the data can no longer be accessed.
-.Pp
-The
-.Fn hsearch
-function is used to search to the hash table.  It returns a pointer into the
-hash table indicating the address of an item.  The
-.Fa item
-argument is of type
-.Dv ENTRY ,
-a structural type which contains the following members:
-.Bl -tag -compact -offset indent -width voidX*dataXX
-.It Fa char *key
-comparison key.
-.It Fa void *data
-pointer to data associated with
-.Fa key .
-.El
-.Pp
-The key comparison function used by
-.Fn hsearch
-is
-.Xr strcmp 3 .
-.Pp
-The
-.Fa action
-argument is of type
-.Dv ACTION ,
-an enumeration type which defines the following values:
-.Bl -tag -compact -offset indent -width ENTERXX
-.It Dv ENTER
-insert
-.Fa item
-into the hash table, possibly replacing an existing item.
-.It Dv FIND
-search the hash table without inserting
-.Fa item .
-Unsuccessful resolution is indicated by the return of a
-.Dv NULL
-pointer.
-.El
-.Pp
-.Sh RETURN VALUES
-If successful, the
-.Fn hcreate
-function returns a non-zero value.  Otherwise, a value of 0 is returned and
-.Va errno
-is set to indicate the error.
-.Pp
-The
-.Fn hdestroy
-functions
-returns no value.
-.Pp
-If successful, the
-.Fn hsearch
-function returns a pointer to the item.
-If the action is
-.Dv FIND
-and the item was not found, or if the action is
-.Dv ENTER
-and the insertion failed,
-.Dv NULL
-is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn hcreate
-and
-.Fn hsearch
-functions will fail if:
-.Bl -tag -width Er
-.It Bq Er ENOMEM
-Insufficient memory is available.
-.El
-.Sh SEE ALSO
-.Xr bsearch 3 ,
-.Xr lsearch 3 ,
-.Xr malloc 3 ,
-.Xr strcmp 3
-.Sh STANDARDS
-The
-.Fn hcreate ,
-.Fn hdestroy
-and
-.Fn hsearch
-functions conform to
-.St -xpg4.2 .
-.Sh BUGS
-The
-.Fn hsearch
-function currently returns a pointer into a static buffer area; subsequent
-calls to
-.Fn hsearch