mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-20 12:00:06 +00:00
bf7997b65c
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.
449 lines
8.9 KiB
C
449 lines
8.9 KiB
C
/*-
|
|
* See the file LICENSE for redistribution information.
|
|
*
|
|
* Copyright (c) 1996, 1997, 1998
|
|
* Sleepycat Software. All rights reserved.
|
|
*/
|
|
/*
|
|
* Copyright (c) 1990, 1993
|
|
* Margo Seltzer. All rights reserved.
|
|
*/
|
|
/*
|
|
* 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 "config.h"
|
|
|
|
#ifndef lint
|
|
static const char sccsid[] = "@(#)dbm.c 10.16 (Sleepycat) 5/7/98";
|
|
#endif /* not lint */
|
|
|
|
#ifndef NO_SYSTEM_INCLUDES
|
|
#include <sys/types.h>
|
|
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <string.h>
|
|
#endif
|
|
|
|
#define DB_DBM_HSEARCH 1
|
|
#include "db_int.h"
|
|
|
|
#include "db_page.h"
|
|
#include "hash.h"
|
|
|
|
/*
|
|
*
|
|
* This package provides dbm and ndbm compatible interfaces to DB.
|
|
*
|
|
* The DBM routines, which call the NDBM routines.
|
|
*/
|
|
static DBM *__cur_db;
|
|
|
|
static void __db_no_open __P((void));
|
|
|
|
int
|
|
__db_dbm_init(file)
|
|
char *file;
|
|
{
|
|
if (__cur_db != NULL)
|
|
(void)dbm_close(__cur_db);
|
|
if ((__cur_db =
|
|
dbm_open(file, O_CREAT | O_RDWR, __db_omode("rw----"))) != NULL)
|
|
return (0);
|
|
if ((__cur_db = dbm_open(file, O_RDONLY, 0)) != NULL)
|
|
return (0);
|
|
return (-1);
|
|
}
|
|
weak_alias (__db_dbm_init, dbminit)
|
|
|
|
datum
|
|
__db_dbm_fetch(key)
|
|
datum key;
|
|
{
|
|
datum item;
|
|
|
|
if (__cur_db == NULL) {
|
|
__db_no_open();
|
|
item.dptr = 0;
|
|
return (item);
|
|
}
|
|
return (dbm_fetch(__cur_db, key));
|
|
}
|
|
weak_alias (__db_dbm_fetch, fetch)
|
|
|
|
datum
|
|
__db_dbm_firstkey()
|
|
{
|
|
datum item;
|
|
|
|
if (__cur_db == NULL) {
|
|
__db_no_open();
|
|
item.dptr = 0;
|
|
return (item);
|
|
}
|
|
return (dbm_firstkey(__cur_db));
|
|
}
|
|
#undef firstkey
|
|
weak_alias (__db_dbm_firstkey, firstkey)
|
|
|
|
datum
|
|
__db_dbm_nextkey(key)
|
|
datum key;
|
|
{
|
|
datum item;
|
|
|
|
COMPQUIET(key.dsize, 0);
|
|
|
|
if (__cur_db == NULL) {
|
|
__db_no_open();
|
|
item.dptr = 0;
|
|
return (item);
|
|
}
|
|
return (dbm_nextkey(__cur_db));
|
|
}
|
|
weak_alias (__db_dbm_nextkey, nextkey)
|
|
|
|
int
|
|
__db_dbm_delete(key)
|
|
datum key;
|
|
{
|
|
int ret;
|
|
|
|
if (__cur_db == NULL) {
|
|
__db_no_open();
|
|
return (-1);
|
|
}
|
|
ret = dbm_delete(__cur_db, key);
|
|
if (ret == 0)
|
|
ret = (((DB *)__cur_db)->sync)((DB *)__cur_db, 0);
|
|
return (ret);
|
|
}
|
|
weak_alias (__db_dbm_delete, delete)
|
|
|
|
int
|
|
__db_dbm_store(key, dat)
|
|
datum key, dat;
|
|
{
|
|
int ret;
|
|
|
|
if (__cur_db == NULL) {
|
|
__db_no_open();
|
|
return (-1);
|
|
}
|
|
ret = dbm_store(__cur_db, key, dat, DBM_REPLACE);
|
|
if (ret == 0)
|
|
ret = (((DB *)__cur_db)->sync)((DB *)__cur_db, 0);
|
|
return (ret);
|
|
}
|
|
weak_alias (__db_dbm_store, store)
|
|
|
|
static void
|
|
__db_no_open()
|
|
{
|
|
(void)fprintf(stderr, "dbm: no open database.\n");
|
|
}
|
|
|
|
/*
|
|
* This package provides dbm and ndbm compatible interfaces to DB.
|
|
*
|
|
* The NDBM routines, which call the DB routines.
|
|
*/
|
|
/*
|
|
* Returns:
|
|
* *DBM on success
|
|
* NULL on failure
|
|
*/
|
|
DBM *
|
|
__db_ndbm_open(file, oflags, mode)
|
|
const char *file;
|
|
int oflags, mode;
|
|
{
|
|
DB *dbp;
|
|
DB_INFO dbinfo;
|
|
char path[MAXPATHLEN];
|
|
|
|
memset(&dbinfo, 0, sizeof(dbinfo));
|
|
dbinfo.db_pagesize = 4096;
|
|
dbinfo.h_ffactor = 40;
|
|
dbinfo.h_nelem = 1;
|
|
|
|
/*
|
|
* XXX
|
|
* Don't use sprintf(3)/snprintf(3) -- the former is dangerous, and
|
|
* the latter isn't standard, and we're manipulating strings handed
|
|
* us by the application.
|
|
*/
|
|
if (strlen(file) + strlen(DBM_SUFFIX) + 1 > sizeof(path)) {
|
|
errno = ENAMETOOLONG;
|
|
return (NULL);
|
|
}
|
|
(void)strcpy(path, file);
|
|
(void)strcat(path, DBM_SUFFIX);
|
|
if ((errno = db_open(path,
|
|
DB_HASH, __db_oflags(oflags), mode, NULL, &dbinfo, &dbp)) != 0)
|
|
return (NULL);
|
|
return ((DBM *)dbp);
|
|
}
|
|
weak_alias (__db_ndbm_open, dbm_open)
|
|
|
|
/*
|
|
* Returns:
|
|
* Nothing.
|
|
*/
|
|
void
|
|
__db_ndbm_close(db)
|
|
DBM *db;
|
|
{
|
|
(void)db->close(db, 0);
|
|
}
|
|
weak_alias (__db_ndbm_close, dbm_close)
|
|
|
|
/*
|
|
* Returns:
|
|
* DATUM on success
|
|
* NULL on failure
|
|
*/
|
|
datum
|
|
__db_ndbm_fetch(db, key)
|
|
DBM *db;
|
|
datum key;
|
|
{
|
|
DBT _key, _data;
|
|
datum data;
|
|
int ret;
|
|
|
|
memset(&_key, 0, sizeof(DBT));
|
|
memset(&_data, 0, sizeof(DBT));
|
|
_key.size = key.dsize;
|
|
_key.data = key.dptr;
|
|
if ((ret = db->get((DB *)db, NULL, &_key, &_data, 0)) == 0) {
|
|
data.dptr = _data.data;
|
|
data.dsize = _data.size;
|
|
} else {
|
|
data.dptr = NULL;
|
|
data.dsize = 0;
|
|
__set_errno (ret == DB_NOTFOUND ? ENOENT : ret);
|
|
}
|
|
return (data);
|
|
}
|
|
weak_alias (__db_ndbm_fetch, dbm_fetch)
|
|
|
|
/*
|
|
* Returns:
|
|
* DATUM on success
|
|
* NULL on failure
|
|
*/
|
|
datum
|
|
__db_ndbm_firstkey(db)
|
|
DBM *db;
|
|
{
|
|
DBT _key, _data;
|
|
datum key;
|
|
int ret;
|
|
|
|
DBC *cp;
|
|
|
|
if ((cp = TAILQ_FIRST(&db->curs_queue)) == NULL)
|
|
if ((errno = db->cursor(db, NULL, &cp)) != 0) {
|
|
memset(&key, 0, sizeof(key));
|
|
return (key);
|
|
}
|
|
|
|
memset(&_key, 0, sizeof(DBT));
|
|
memset(&_data, 0, sizeof(DBT));
|
|
if ((ret = (cp->c_get)(cp, &_key, &_data, DB_FIRST)) == 0) {
|
|
key.dptr = _key.data;
|
|
key.dsize = _key.size;
|
|
} else {
|
|
key.dptr = NULL;
|
|
key.dsize = 0;
|
|
__set_errno (ret == DB_NOTFOUND ? ENOENT : ret);
|
|
}
|
|
return (key);
|
|
}
|
|
weak_alias (__db_ndbm_firstkey, dbm_firstkey)
|
|
|
|
/*
|
|
* Returns:
|
|
* DATUM on success
|
|
* NULL on failure
|
|
*/
|
|
datum
|
|
__db_ndbm_nextkey(db)
|
|
DBM *db;
|
|
{
|
|
DBC *cp;
|
|
DBT _key, _data;
|
|
datum key;
|
|
int ret;
|
|
|
|
if ((cp = TAILQ_FIRST(&db->curs_queue)) == NULL)
|
|
if ((errno = db->cursor(db, NULL, &cp)) != 0) {
|
|
memset(&key, 0, sizeof(key));
|
|
return (key);
|
|
}
|
|
|
|
memset(&_key, 0, sizeof(DBT));
|
|
memset(&_data, 0, sizeof(DBT));
|
|
if ((ret = (cp->c_get)(cp, &_key, &_data, DB_NEXT)) == 0) {
|
|
key.dptr = _key.data;
|
|
key.dsize = _key.size;
|
|
} else {
|
|
key.dptr = NULL;
|
|
key.dsize = 0;
|
|
__set_errno (ret == DB_NOTFOUND ? ENOENT : ret);
|
|
}
|
|
return (key);
|
|
}
|
|
weak_alias (__db_ndbm_nextkey, dbm_nextkey)
|
|
|
|
/*
|
|
* Returns:
|
|
* 0 on success
|
|
* <0 failure
|
|
*/
|
|
int
|
|
__db_ndbm_delete(db, key)
|
|
DBM *db;
|
|
datum key;
|
|
{
|
|
DBT _key;
|
|
int ret;
|
|
|
|
memset(&_key, 0, sizeof(DBT));
|
|
_key.data = key.dptr;
|
|
_key.size = key.dsize;
|
|
if ((ret = (((DB *)db)->del)((DB *)db, NULL, &_key, 0)) == 0)
|
|
return (0);
|
|
errno = ret == DB_NOTFOUND ? ENOENT : ret;
|
|
return (-1);
|
|
}
|
|
weak_alias (__db_ndbm_delete, dbm_delete)
|
|
|
|
/*
|
|
* Returns:
|
|
* 0 on success
|
|
* <0 failure
|
|
* 1 if DBM_INSERT and entry exists
|
|
*/
|
|
int
|
|
__db_ndbm_store(db, key, data, flags)
|
|
DBM *db;
|
|
datum key, data;
|
|
int flags;
|
|
{
|
|
DBT _key, _data;
|
|
int ret;
|
|
|
|
memset(&_key, 0, sizeof(DBT));
|
|
memset(&_data, 0, sizeof(DBT));
|
|
_key.data = key.dptr;
|
|
_key.size = key.dsize;
|
|
_data.data = data.dptr;
|
|
_data.size = data.dsize;
|
|
if ((ret = db->put((DB *)db, NULL,
|
|
&_key, &_data, flags == DBM_INSERT ? DB_NOOVERWRITE : 0)) == 0)
|
|
return (0);
|
|
if (ret == DB_KEYEXIST)
|
|
return (1);
|
|
errno = ret;
|
|
return (-1);
|
|
}
|
|
weak_alias (__db_ndbm_store, dbm_store)
|
|
|
|
int
|
|
__db_ndbm_error(db)
|
|
DBM *db;
|
|
{
|
|
HTAB *hp;
|
|
|
|
hp = (HTAB *)db->internal;
|
|
return (hp->local_errno);
|
|
}
|
|
weak_alias (__db_ndbm_error, dbm_error)
|
|
|
|
int
|
|
__db_ndbm_clearerr(db)
|
|
DBM *db;
|
|
{
|
|
HTAB *hp;
|
|
|
|
hp = (HTAB *)db->internal;
|
|
hp->local_errno = 0;
|
|
return (0);
|
|
}
|
|
weak_alias (__db_ndbm_clearerr, dbm_clearerr)
|
|
|
|
/*
|
|
* Returns:
|
|
* 1 if read-only
|
|
* 0 if not read-only
|
|
*/
|
|
int
|
|
__db_ndbm_rdonly(db)
|
|
DBM *db;
|
|
{
|
|
return (F_ISSET((DB *)db, DB_AM_RDONLY) ? 1 : 0);
|
|
}
|
|
|
|
/*
|
|
* XXX
|
|
* We only have a single file descriptor that we can return, not two. Return
|
|
* the same one for both files. Hopefully, the user is using it for locking
|
|
* and picked one to use at random.
|
|
*/
|
|
int
|
|
__db_ndbm_dirfno(db)
|
|
DBM *db;
|
|
{
|
|
int fd;
|
|
|
|
(void)db->fd(db, &fd);
|
|
return (fd);
|
|
}
|
|
weak_alias (__db_ndbm_dirfno, dbm_dirfno)
|
|
|
|
int
|
|
__db_ndbm_pagfno(db)
|
|
DBM *db;
|
|
{
|
|
int fd;
|
|
|
|
(void)db->fd(db, &fd);
|
|
return (fd);
|
|
}
|
|
weak_alias (__db_ndbm_pagfno, dbm_pagfno)
|