XPG4.2: Change member `dsize' of struct datum from int to size_t.
Version dbm_{delete,fetch,firstkey,nextkey,store}() accordingly.
Fixes PRs standards/21402 from Ben Harris and standards/25343 from
Murray Armfield.
This commit is contained in:
kleink
parent
496077ab25
commit
dbfbef898d
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: ndbm.h,v 1.12 2004/04/27 20:59:43 kleink Exp $ */
|
||||
/* $NetBSD: ndbm.h,v 1.13 2004/04/28 00:10:52 kleink Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1990, 1993
|
||||
@ -59,8 +59,12 @@
|
||||
#endif
|
||||
|
||||
typedef struct {
|
||||
void *dptr;
|
||||
int dsize; /* XXX */
|
||||
void *dptr;
|
||||
#if defined(__LIBC12_SOURCE__)
|
||||
int dsize; /* XXX */
|
||||
#else
|
||||
size_t dsize; /* XPG4.2 */
|
||||
#endif
|
||||
} datum;
|
||||
|
||||
typedef DB DBM;
|
||||
@ -70,17 +74,25 @@ typedef DB DBM;
|
||||
|
||||
__BEGIN_DECLS
|
||||
void dbm_close(DBM *);
|
||||
int dbm_delete(DBM *, datum);
|
||||
datum dbm_fetch(DBM *, datum);
|
||||
datum dbm_firstkey(DBM *);
|
||||
datum dbm_nextkey(DBM *);
|
||||
DBM *dbm_open(const char *, int, mode_t);
|
||||
int dbm_store(DBM *, datum, datum, int);
|
||||
int dbm_error(DBM *);
|
||||
int dbm_clearerr(DBM *);
|
||||
#if defined(_NETBSD_SOURCE)
|
||||
int dbm_dirfno(DBM *);
|
||||
#endif
|
||||
#if defined(__LIBC12_SOURCE__)
|
||||
int dbm_delete(DBM *, datum);
|
||||
datum dbm_fetch(DBM *, datum);
|
||||
datum dbm_firstkey(DBM *);
|
||||
datum dbm_nextkey(DBM *);
|
||||
int dbm_store(DBM *, datum, datum, int);
|
||||
#else
|
||||
int dbm_delete(DBM *, datum) __RENAME(__dbm_delete13);
|
||||
datum dbm_fetch(DBM *, datum) __RENAME(__dbm_fetch13);
|
||||
datum dbm_firstkey(DBM *) __RENAME(__dbm_firstkey13);
|
||||
datum dbm_nextkey(DBM *) __RENAME(__dbm_nextkey13);
|
||||
int dbm_store(DBM *, datum, datum, int) __RENAME(__dbm_store13);
|
||||
#endif
|
||||
__END_DECLS
|
||||
|
||||
#endif /* !_NDBM_H_ */
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# $NetBSD: Makefile.inc,v 1.7 2001/02/14 05:44:29 cgd Exp $
|
||||
# $NetBSD: Makefile.inc,v 1.8 2004/04/28 00:10:52 kleink Exp $
|
||||
# @(#)Makefile.inc 8.1 (Berkeley) 6/4/93
|
||||
|
||||
.PATH: ${.CURDIR}/db/hash
|
||||
|
||||
SRCS+= hash.c hash_bigkey.c hash_buf.c hash_func.c hash_log2.c \
|
||||
hash_page.c ndbm.c
|
||||
hash_page.c __ndbm13.c ndbm.c
|
||||
|
||||
250
lib/libc/db/hash/__ndbm13.c
Normal file
250
lib/libc/db/hash/__ndbm13.c
Normal file
@ -0,0 +1,250 @@
|
||||
/* $NetBSD: __ndbm13.c,v 1.1 2004/04/28 00:10:52 kleink Exp $ */
|
||||
/* from: NetBSD: ndbm.c,v 1.18 2004/04/27 20:03:45 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. 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[] = "@(#)ndbm.c 8.4 (Berkeley) 7/21/94";
|
||||
#else
|
||||
__RCSID("$NetBSD: __ndbm13.c,v 1.1 2004/04/28 00:10:52 kleink Exp $");
|
||||
#endif
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
|
||||
/*
|
||||
* This package provides a dbm compatible interface to the new hashing
|
||||
* package described in db(3).
|
||||
*/
|
||||
#include "namespace.h"
|
||||
#include <sys/param.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <ndbm.h>
|
||||
#include "hash.h"
|
||||
|
||||
#ifdef __LIBC12_SOURCE__
|
||||
__warn_references(dbm_delete,
|
||||
"warning: reference to compatibility dbm_delete();"
|
||||
" include <ndbm.h> for correct reference")
|
||||
__warn_references(dbm_fetch,
|
||||
"warning: reference to compatibility dbm_fetch();"
|
||||
" include <ndbm.h> for correct reference")
|
||||
__warn_references(dbm_firstkey,
|
||||
"warning: reference to compatibility dbm_firstkey();"
|
||||
" include <ndbm.h> for correct reference")
|
||||
__warn_references(dbm_nextkey,
|
||||
"warning: reference to compatibility dbm_nextkey();"
|
||||
" include <ndbm.h> for correct reference")
|
||||
__warn_references(dbm_store,
|
||||
"warning: reference to compatibility dbm_store();"
|
||||
" include <ndbm.h> for correct reference")
|
||||
#endif
|
||||
|
||||
#ifndef __LIBC12_SOURCE__
|
||||
/*
|
||||
* Returns:
|
||||
* *DBM on success
|
||||
* NULL on failure
|
||||
*/
|
||||
extern DBM *
|
||||
dbm_open(file, flags, mode)
|
||||
const char *file;
|
||||
int flags;
|
||||
mode_t mode;
|
||||
{
|
||||
HASHINFO info;
|
||||
char path[MAXPATHLEN];
|
||||
|
||||
info.bsize = 4096;
|
||||
info.ffactor = 40;
|
||||
info.nelem = 1;
|
||||
info.cachesize = 0;
|
||||
info.hash = NULL;
|
||||
info.lorder = 0;
|
||||
(void)strncpy(path, file, sizeof(path) - 1);
|
||||
(void)strncat(path, DBM_SUFFIX, sizeof(path) - strlen(path) - 1);
|
||||
return ((DBM *)__hash_open(path, flags, mode, &info, 0));
|
||||
}
|
||||
|
||||
extern void
|
||||
dbm_close(db)
|
||||
DBM *db;
|
||||
{
|
||||
(void)(db->close)(db);
|
||||
}
|
||||
#endif /* !__LIBC12_SOURCE__ */
|
||||
|
||||
/*
|
||||
* 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,
|
||||
(u_int)((flags == DBM_INSERT) ? R_NOOVERWRITE : 0)));
|
||||
}
|
||||
|
||||
#ifndef __LIBC12_SOURCE__
|
||||
extern int
|
||||
dbm_error(db)
|
||||
DBM *db;
|
||||
{
|
||||
HTAB *hp;
|
||||
|
||||
hp = (HTAB *)db->internal;
|
||||
return (hp->err);
|
||||
}
|
||||
|
||||
extern int
|
||||
dbm_clearerr(db)
|
||||
DBM *db;
|
||||
{
|
||||
HTAB *hp;
|
||||
|
||||
hp = (HTAB *)db->internal;
|
||||
hp->err = 0;
|
||||
return (0);
|
||||
}
|
||||
|
||||
extern int
|
||||
dbm_dirfno(db)
|
||||
DBM *db;
|
||||
{
|
||||
return(((HTAB *)db->internal)->fp);
|
||||
}
|
||||
#endif /* !__LIBC12_SOURCE__ */
|
||||
@ -1,227 +1,10 @@
|
||||
/* $NetBSD: ndbm.c,v 1.18 2004/04/27 20:03:45 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. 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[] = "@(#)ndbm.c 8.4 (Berkeley) 7/21/94";
|
||||
#else
|
||||
__RCSID("$NetBSD: ndbm.c,v 1.18 2004/04/27 20:03:45 kleink Exp $");
|
||||
#endif
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
/* $NetBSD: ndbm.c,v 1.19 2004/04/28 00:10:52 kleink Exp $ */
|
||||
|
||||
/*
|
||||
* This package provides a dbm compatible interface to the new hashing
|
||||
* package described in db(3).
|
||||
* Written by Klaus Klein <kleink@NetBSD.org>, April 28, 2004.
|
||||
* Public domain.
|
||||
*/
|
||||
#include "namespace.h"
|
||||
#include <sys/param.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#define __LIBC12_SOURCE__
|
||||
|
||||
#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_t mode;
|
||||
{
|
||||
HASHINFO info;
|
||||
char path[MAXPATHLEN];
|
||||
|
||||
info.bsize = 4096;
|
||||
info.ffactor = 40;
|
||||
info.nelem = 1;
|
||||
info.cachesize = 0;
|
||||
info.hash = NULL;
|
||||
info.lorder = 0;
|
||||
(void)strncpy(path, file, sizeof(path) - 1);
|
||||
(void)strncat(path, DBM_SUFFIX, sizeof(path) - strlen(path) - 1);
|
||||
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,
|
||||
(u_int)((flags == DBM_INSERT) ? R_NOOVERWRITE : 0)));
|
||||
}
|
||||
|
||||
extern int
|
||||
dbm_error(db)
|
||||
DBM *db;
|
||||
{
|
||||
HTAB *hp;
|
||||
|
||||
hp = (HTAB *)db->internal;
|
||||
return (hp->err);
|
||||
}
|
||||
|
||||
extern int
|
||||
dbm_clearerr(db)
|
||||
DBM *db;
|
||||
{
|
||||
HTAB *hp;
|
||||
|
||||
hp = (HTAB *)db->internal;
|
||||
hp->err = 0;
|
||||
return (0);
|
||||
}
|
||||
|
||||
extern int
|
||||
dbm_dirfno(db)
|
||||
DBM *db;
|
||||
{
|
||||
return(((HTAB *)db->internal)->fp);
|
||||
}
|
||||
#include "__ndbm13.c"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user