mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-29 16:21:07 +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.
161 lines
3.6 KiB
C
161 lines
3.6 KiB
C
/*-
|
|
* See the file LICENSE for redistribution information.
|
|
*
|
|
* Copyright (c) 1996, 1997, 1998
|
|
* Sleepycat Software. All rights reserved.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#ifndef lint
|
|
static const char sccsid[] = "@(#)db_ret.c 10.13 (Sleepycat) 5/7/98";
|
|
#endif /* not lint */
|
|
|
|
#ifndef NO_SYSTEM_INCLUDES
|
|
#include <sys/types.h>
|
|
|
|
#include <errno.h>
|
|
#include <string.h>
|
|
#endif
|
|
|
|
#include "db_int.h"
|
|
#include "db_page.h"
|
|
#include "btree.h"
|
|
#include "db_am.h"
|
|
|
|
/*
|
|
* __db_ret --
|
|
* Build return DBT.
|
|
*
|
|
* PUBLIC: int __db_ret __P((DB *,
|
|
* PUBLIC: PAGE *, u_int32_t, DBT *, void **, u_int32_t *));
|
|
*/
|
|
int
|
|
__db_ret(dbp, h, indx, dbt, memp, memsize)
|
|
DB *dbp;
|
|
PAGE *h;
|
|
u_int32_t indx;
|
|
DBT *dbt;
|
|
void **memp;
|
|
u_int32_t *memsize;
|
|
{
|
|
BKEYDATA *bk;
|
|
HOFFPAGE ho;
|
|
BOVERFLOW *bo;
|
|
u_int32_t len;
|
|
u_int8_t *hk;
|
|
void *data;
|
|
|
|
switch (TYPE(h)) {
|
|
case P_HASH:
|
|
hk = P_ENTRY(h, indx);
|
|
if (HPAGE_PTYPE(hk) == H_OFFPAGE) {
|
|
memcpy(&ho, hk, sizeof(HOFFPAGE));
|
|
return (__db_goff(dbp, dbt,
|
|
ho.tlen, ho.pgno, memp, memsize));
|
|
}
|
|
len = LEN_HKEYDATA(h, dbp->pgsize, indx);
|
|
data = HKEYDATA_DATA(hk);
|
|
break;
|
|
case P_DUPLICATE:
|
|
case P_LBTREE:
|
|
case P_LRECNO:
|
|
bk = GET_BKEYDATA(h, indx);
|
|
if (B_TYPE(bk->type) == B_OVERFLOW) {
|
|
bo = (BOVERFLOW *)bk;
|
|
return (__db_goff(dbp, dbt,
|
|
bo->tlen, bo->pgno, memp, memsize));
|
|
}
|
|
len = bk->len;
|
|
data = bk->data;
|
|
break;
|
|
default:
|
|
return (__db_pgfmt(dbp, h->pgno));
|
|
}
|
|
|
|
return (__db_retcopy(dbt, data, len, memp, memsize,
|
|
F_ISSET(dbt, DB_DBT_INTERNAL) ? NULL : dbp->db_malloc));
|
|
}
|
|
|
|
/*
|
|
* __db_retcopy --
|
|
* Copy the returned data into the user's DBT, handling special flags.
|
|
*
|
|
* PUBLIC: int __db_retcopy __P((DBT *,
|
|
* PUBLIC: void *, u_int32_t, void **, u_int32_t *, void *(*)(size_t)));
|
|
*/
|
|
int
|
|
__db_retcopy(dbt, data, len, memp, memsize, db_malloc)
|
|
DBT *dbt;
|
|
void *data;
|
|
u_int32_t len;
|
|
void **memp;
|
|
u_int32_t *memsize;
|
|
void *(*db_malloc) __P((size_t));
|
|
{
|
|
/* If returning a partial record, reset the length. */
|
|
if (F_ISSET(dbt, DB_DBT_PARTIAL)) {
|
|
data = (u_int8_t *)data + dbt->doff;
|
|
if (len > dbt->doff) {
|
|
len -= dbt->doff;
|
|
if (len > dbt->dlen)
|
|
len = dbt->dlen;
|
|
} else
|
|
len = 0;
|
|
}
|
|
|
|
/*
|
|
* Return the length of the returned record in the DBT size field.
|
|
* This satisfies the requirement that if we're using user memory
|
|
* and insufficient memory was provided, return the amount necessary
|
|
* in the size field.
|
|
*/
|
|
dbt->size = len;
|
|
|
|
/*
|
|
* Allocate memory to be owned by the application: DB_DBT_MALLOC.
|
|
*
|
|
* !!!
|
|
* We always allocate memory, even if we're copying out 0 bytes. This
|
|
* guarantees consistency, i.e., the application can always free memory
|
|
* without concern as to how many bytes of the record were requested.
|
|
*
|
|
* XXX
|
|
* Never allocate 0 bytes, it's known to make malloc/realloc unhappy.
|
|
*
|
|
* Use the memory specified by the application: DB_DBT_USERMEM.
|
|
*
|
|
* !!!
|
|
* If the length we're going to copy is 0, the application-supplied
|
|
* memory pointer is allowed to be NULL.
|
|
*/
|
|
if (F_ISSET(dbt, DB_DBT_MALLOC)) {
|
|
dbt->data = db_malloc == NULL ?
|
|
(void *)__db_malloc(len) :
|
|
(void *)db_malloc(len + 1);
|
|
if (dbt->data == NULL)
|
|
return (ENOMEM);
|
|
} else if (F_ISSET(dbt, DB_DBT_USERMEM)) {
|
|
if (len != 0 && (dbt->data == NULL || dbt->ulen < len))
|
|
return (ENOMEM);
|
|
} else if (memp == NULL || memsize == NULL) {
|
|
return (EINVAL);
|
|
} else {
|
|
if (len != 0 && (*memsize == 0 || *memsize < len)) {
|
|
*memp = *memp == NULL ?
|
|
(void *)__db_malloc(len) :
|
|
(void *)__db_realloc(*memp, len);
|
|
if (*memp == NULL) {
|
|
*memsize = 0;
|
|
return (ENOMEM);
|
|
}
|
|
*memsize = len;
|
|
}
|
|
dbt->data = *memp;
|
|
}
|
|
|
|
if (len != 0)
|
|
memcpy(dbt->data, data, len);
|
|
return (0);
|
|
}
|