* libc/include/ndbm.h: Remove.
* libc/search/ndbm.c: Remove.
This commit is contained in:
parent
30a0616840
commit
3118725a60
@ -1,3 +1,8 @@
|
|||||||
|
2002-06-24 Thomas Fitzsimmons <fitzsim@redhat.com>
|
||||||
|
|
||||||
|
* libc/include/ndbm.h: Remove.
|
||||||
|
* libc/search/ndbm.c: Remove.
|
||||||
|
|
||||||
2002-06-24 WATANABE Hirofumi <eban@os.rim.or.jp>
|
2002-06-24 WATANABE Hirofumi <eban@os.rim.or.jp>
|
||||||
|
|
||||||
* libc/stdio/fseek.c (fseek): Fix braces.
|
* libc/stdio/fseek.c (fseek): Fix braces.
|
||||||
|
@ -1,80 +0,0 @@
|
|||||||
/*-
|
|
||||||
* 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.
|
|
||||||
*
|
|
||||||
* @(#)ndbm.h 8.1 (Berkeley) 6/2/93
|
|
||||||
* $FreeBSD: src/include/ndbm.h,v 1.4 2002/03/23 17:24:53 imp Exp $
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef _NDBM_H_
|
|
||||||
#define _NDBM_H_
|
|
||||||
|
|
||||||
#include <db.h>
|
|
||||||
|
|
||||||
/* Map dbm interface onto db(3). */
|
|
||||||
#define DBM_RDONLY O_RDONLY
|
|
||||||
|
|
||||||
/* Flags to dbm_store(). */
|
|
||||||
#define DBM_INSERT 0
|
|
||||||
#define DBM_REPLACE 1
|
|
||||||
|
|
||||||
/*
|
|
||||||
* The db(3) support for ndbm always appends this suffix to the
|
|
||||||
* file name to avoid overwriting the user's original database.
|
|
||||||
*/
|
|
||||||
#define DBM_SUFFIX ".db"
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
char *dptr;
|
|
||||||
int dsize;
|
|
||||||
} datum;
|
|
||||||
|
|
||||||
typedef DB DBM;
|
|
||||||
#define dbm_pagfno(a) DBM_PAGFNO_NOT_AVAILABLE
|
|
||||||
|
|
||||||
__BEGIN_DECLS
|
|
||||||
int dbm_clearerr(DBM *);
|
|
||||||
void dbm_close(DBM *);
|
|
||||||
int dbm_delete(DBM *, datum);
|
|
||||||
int dbm_error(DBM *);
|
|
||||||
datum dbm_fetch(DBM *, datum);
|
|
||||||
datum dbm_firstkey(DBM *);
|
|
||||||
long dbm_forder(DBM *, datum);
|
|
||||||
datum dbm_nextkey(DBM *);
|
|
||||||
DBM *dbm_open(const char *, int, int);
|
|
||||||
int dbm_store(DBM *, datum, datum, int);
|
|
||||||
int dbm_dirfno(DBM *);
|
|
||||||
__END_DECLS
|
|
||||||
|
|
||||||
#endif /* !_NDBM_H_ */
|
|
@ -16,7 +16,6 @@ LIB_SOURCES = \
|
|||||||
hash_page.c \
|
hash_page.c \
|
||||||
hcreate.c \
|
hcreate.c \
|
||||||
hcreate_r.c \
|
hcreate_r.c \
|
||||||
ndbm.c \
|
|
||||||
page.h \
|
page.h \
|
||||||
qsort.c \
|
qsort.c \
|
||||||
tdelete.c \
|
tdelete.c \
|
||||||
|
@ -120,7 +120,6 @@ LIB_SOURCES = \
|
|||||||
hash_page.c \
|
hash_page.c \
|
||||||
hcreate.c \
|
hcreate.c \
|
||||||
hcreate_r.c \
|
hcreate_r.c \
|
||||||
ndbm.c \
|
|
||||||
page.h \
|
page.h \
|
||||||
qsort.c \
|
qsort.c \
|
||||||
tdelete.c \
|
tdelete.c \
|
||||||
@ -151,7 +150,7 @@ lib_a_LIBADD =
|
|||||||
@USE_LIBTOOL_FALSE@hash_bigkey.$(OBJEXT) hash_buf.$(OBJEXT) \
|
@USE_LIBTOOL_FALSE@hash_bigkey.$(OBJEXT) hash_buf.$(OBJEXT) \
|
||||||
@USE_LIBTOOL_FALSE@hash_func.$(OBJEXT) hash_log2.$(OBJEXT) \
|
@USE_LIBTOOL_FALSE@hash_func.$(OBJEXT) hash_log2.$(OBJEXT) \
|
||||||
@USE_LIBTOOL_FALSE@hash_page.$(OBJEXT) hcreate.$(OBJEXT) \
|
@USE_LIBTOOL_FALSE@hash_page.$(OBJEXT) hcreate.$(OBJEXT) \
|
||||||
@USE_LIBTOOL_FALSE@hcreate_r.$(OBJEXT) ndbm.$(OBJEXT) qsort.$(OBJEXT) \
|
@USE_LIBTOOL_FALSE@hcreate_r.$(OBJEXT) qsort.$(OBJEXT) \
|
||||||
@USE_LIBTOOL_FALSE@tdelete.$(OBJEXT) tdestroy.$(OBJEXT) tfind.$(OBJEXT) \
|
@USE_LIBTOOL_FALSE@tdelete.$(OBJEXT) tdestroy.$(OBJEXT) tfind.$(OBJEXT) \
|
||||||
@USE_LIBTOOL_FALSE@tsearch.$(OBJEXT) twalk.$(OBJEXT)
|
@USE_LIBTOOL_FALSE@tsearch.$(OBJEXT) twalk.$(OBJEXT)
|
||||||
LTLIBRARIES = $(noinst_LTLIBRARIES)
|
LTLIBRARIES = $(noinst_LTLIBRARIES)
|
||||||
@ -159,7 +158,7 @@ LTLIBRARIES = $(noinst_LTLIBRARIES)
|
|||||||
libsearch_la_LIBADD =
|
libsearch_la_LIBADD =
|
||||||
@USE_LIBTOOL_TRUE@libsearch_la_OBJECTS = bsearch.lo hash.lo \
|
@USE_LIBTOOL_TRUE@libsearch_la_OBJECTS = bsearch.lo hash.lo \
|
||||||
@USE_LIBTOOL_TRUE@hash_bigkey.lo hash_buf.lo hash_func.lo hash_log2.lo \
|
@USE_LIBTOOL_TRUE@hash_bigkey.lo hash_buf.lo hash_func.lo hash_log2.lo \
|
||||||
@USE_LIBTOOL_TRUE@hash_page.lo hcreate.lo hcreate_r.lo ndbm.lo qsort.lo \
|
@USE_LIBTOOL_TRUE@hash_page.lo hcreate.lo hcreate_r.lo qsort.lo \
|
||||||
@USE_LIBTOOL_TRUE@tdelete.lo tdestroy.lo tfind.lo tsearch.lo twalk.lo
|
@USE_LIBTOOL_TRUE@tdelete.lo tdestroy.lo tfind.lo tsearch.lo twalk.lo
|
||||||
CFLAGS = @CFLAGS@
|
CFLAGS = @CFLAGS@
|
||||||
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||||
|
@ -1,232 +0,0 @@
|
|||||||
/*-
|
|
||||||
* 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/unistd.h>
|
|
||||||
|
|
||||||
#if defined(LIBC_SCCS) && !defined(lint)
|
|
||||||
static char sccsid[] = "@(#)ndbm.c 8.4 (Berkeley) 7/21/94";
|
|
||||||
#endif /* LIBC_SCCS and not lint */
|
|
||||||
#include <sys/cdefs.h>
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This package provides a dbm compatible interface to the new hashing
|
|
||||||
* package described in db(3).
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <sys/param.h>
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <errno.h>
|
|
||||||
|
|
||||||
#include <ndbm.h>
|
|
||||||
#include "hash.h"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Returns:
|
|
||||||
* *DBM on success
|
|
||||||
* NULL on failure
|
|
||||||
*/
|
|
||||||
extern DBM *
|
|
||||||
dbm_open(file, flags, mode)
|
|
||||||
const char *file;
|
|
||||||
int flags, mode;
|
|
||||||
{
|
|
||||||
HASHINFO info;
|
|
||||||
char path[MAXPATHLEN];
|
|
||||||
|
|
||||||
info.bsize = 4096;
|
|
||||||
info.ffactor = 40;
|
|
||||||
info.nelem = 1;
|
|
||||||
info.cachesize = 0;
|
|
||||||
info.hash = NULL;
|
|
||||||
info.lorder = 0;
|
|
||||||
|
|
||||||
if( strlen(file) >= sizeof(path) - strlen(DBM_SUFFIX)) {
|
|
||||||
errno = ENAMETOOLONG;
|
|
||||||
return(NULL);
|
|
||||||
}
|
|
||||||
(void)strcpy(path, file);
|
|
||||||
(void)strcat(path, DBM_SUFFIX);
|
|
||||||
return ((DBM *)__hash_open(path, flags, mode, &info, 0));
|
|
||||||
}
|
|
||||||
|
|
||||||
extern void
|
|
||||||
dbm_close(db)
|
|
||||||
DBM *db;
|
|
||||||
{
|
|
||||||
(void)(db->close)(db);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Returns:
|
|
||||||
* DATUM on success
|
|
||||||
* NULL on failure
|
|
||||||
*/
|
|
||||||
extern datum
|
|
||||||
dbm_fetch(db, key)
|
|
||||||
DBM *db;
|
|
||||||
datum key;
|
|
||||||
{
|
|
||||||
datum retdata;
|
|
||||||
int status;
|
|
||||||
DBT dbtkey, dbtretdata;
|
|
||||||
|
|
||||||
dbtkey.data = key.dptr;
|
|
||||||
dbtkey.size = key.dsize;
|
|
||||||
status = (db->get)(db, &dbtkey, &dbtretdata, 0);
|
|
||||||
if (status) {
|
|
||||||
dbtretdata.data = NULL;
|
|
||||||
dbtretdata.size = 0;
|
|
||||||
}
|
|
||||||
retdata.dptr = dbtretdata.data;
|
|
||||||
retdata.dsize = dbtretdata.size;
|
|
||||||
return (retdata);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Returns:
|
|
||||||
* DATUM on success
|
|
||||||
* NULL on failure
|
|
||||||
*/
|
|
||||||
extern datum
|
|
||||||
dbm_firstkey(db)
|
|
||||||
DBM *db;
|
|
||||||
{
|
|
||||||
int status;
|
|
||||||
datum retkey;
|
|
||||||
DBT dbtretkey, dbtretdata;
|
|
||||||
|
|
||||||
status = (db->seq)(db, &dbtretkey, &dbtretdata, R_FIRST);
|
|
||||||
if (status)
|
|
||||||
dbtretkey.data = NULL;
|
|
||||||
retkey.dptr = dbtretkey.data;
|
|
||||||
retkey.dsize = dbtretkey.size;
|
|
||||||
return (retkey);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Returns:
|
|
||||||
* DATUM on success
|
|
||||||
* NULL on failure
|
|
||||||
*/
|
|
||||||
extern datum
|
|
||||||
dbm_nextkey(db)
|
|
||||||
DBM *db;
|
|
||||||
{
|
|
||||||
int status;
|
|
||||||
datum retkey;
|
|
||||||
DBT dbtretkey, dbtretdata;
|
|
||||||
|
|
||||||
status = (db->seq)(db, &dbtretkey, &dbtretdata, R_NEXT);
|
|
||||||
if (status)
|
|
||||||
dbtretkey.data = NULL;
|
|
||||||
retkey.dptr = dbtretkey.data;
|
|
||||||
retkey.dsize = dbtretkey.size;
|
|
||||||
return (retkey);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Returns:
|
|
||||||
* 0 on success
|
|
||||||
* <0 failure
|
|
||||||
*/
|
|
||||||
extern int
|
|
||||||
dbm_delete(db, key)
|
|
||||||
DBM *db;
|
|
||||||
datum key;
|
|
||||||
{
|
|
||||||
int status;
|
|
||||||
DBT dbtkey;
|
|
||||||
|
|
||||||
dbtkey.data = key.dptr;
|
|
||||||
dbtkey.size = key.dsize;
|
|
||||||
status = (db->del)(db, &dbtkey, 0);
|
|
||||||
if (status)
|
|
||||||
return (-1);
|
|
||||||
else
|
|
||||||
return (0);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Returns:
|
|
||||||
* 0 on success
|
|
||||||
* <0 failure
|
|
||||||
* 1 if DBM_INSERT and entry exists
|
|
||||||
*/
|
|
||||||
extern int
|
|
||||||
dbm_store(db, key, data, flags)
|
|
||||||
DBM *db;
|
|
||||||
datum key, data;
|
|
||||||
int flags;
|
|
||||||
{
|
|
||||||
DBT dbtkey, dbtdata;
|
|
||||||
|
|
||||||
dbtkey.data = key.dptr;
|
|
||||||
dbtkey.size = key.dsize;
|
|
||||||
dbtdata.data = data.dptr;
|
|
||||||
dbtdata.size = data.dsize;
|
|
||||||
return ((db->put)(db, &dbtkey, &dbtdata,
|
|
||||||
(flags == DBM_INSERT) ? R_NOOVERWRITE : 0));
|
|
||||||
}
|
|
||||||
|
|
||||||
extern int
|
|
||||||
dbm_error(db)
|
|
||||||
DBM *db;
|
|
||||||
{
|
|
||||||
HTAB *hp;
|
|
||||||
|
|
||||||
hp = (HTAB *)db->internal;
|
|
||||||
return (hp->error);
|
|
||||||
}
|
|
||||||
|
|
||||||
extern int
|
|
||||||
dbm_clearerr(db)
|
|
||||||
DBM *db;
|
|
||||||
{
|
|
||||||
HTAB *hp;
|
|
||||||
|
|
||||||
hp = (HTAB *)db->internal;
|
|
||||||
hp->error = 0;
|
|
||||||
return (0);
|
|
||||||
}
|
|
||||||
|
|
||||||
extern int
|
|
||||||
dbm_dirfno(db)
|
|
||||||
DBM *db;
|
|
||||||
{
|
|
||||||
return(((HTAB *)db->internal)->fp);
|
|
||||||
}
|
|
Loading…
x
Reference in New Issue
Block a user