mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-30 14:31:14 +00:00
04be94a87d
1997-12-01 17:27 Ulrich Drepper <drepper@cygnus.com> * Makefile (subdirs): Add iconvdata and localedata. * iconv/gconv.h: Define UNKNOWN_10646_CHAR as error value. * iconv/gconv_conf.c (read_conf_file): Little optimization. * iconvdata/8bit-gap.c: New file. * iconvdata/8bit-generic.c: Renamed from ... * iconvdata/iso8859-generic.c: ...this. * iconvdata/configure: Removed. * iconvdata/Makefile: Add new modules and better rules. * iconvdata/iso6937.c: Minor bug fixes. * iconvdata/iso8859-1.c: Likewise. * iconvdata/t61.c: Likewise. * iconvdata/iso8859-2.c: Change to use 8bit-generic.c. Minor bug fixes. * iconvdata/iso8859-3.c: Likewise. * iconvdata/iso8859-4.c: Likewise. * iconvdata/iso8859-5.c: Likewise. * iconvdata/iso8859-6.c: Likewise. * iconvdata/iso8859-7.c: Likewise. * iconvdata/iso8859-8.c: Likewise. * iconvdata/iso8859-9.c: Likewise. * iconvdata/iso8859-10.c: Likewise. * iconvdata/ebcdic-at-de-a.c: New file. * iconvdata/ebcdic-at-de.c: New file. * iconvdata/ebcdic-ca-fr.c: New file. * iconvdata/hp-roman8.c: New file. * iconvdata/koi-8.c: New file. * iconvdata/koi8-r.c: New file. * iconvdata/koi8-h.c: New file. * iconvdata/latin-greek-1.c: New file. * iconvdata/latin-greek-1.h: New file. * iconvdata/latin-greek.c: New file. * iconvdata/latin-greek.h: New file. * iconvdata/jis0201.c: New file. * iconvdata/jis0201.h: New file. * iconvdata/jis0208.c: New file. * iconvdata/jis0208.h: New file. * iconvdata/jis0212.c: New file. * iconvdata/jis0212.h: New file. * iconvdata/sjis.c: New file. * iconvdata/gap.pl: New file. Script to generate table header. * iconvdata/gaptab.pl: New file. * iconvdata/gconv-modules: Add info about new modules. * locale/programs/charmap.c: Also examine alias names given in charmap files. * localedata/*: Add to here from add-on. We need the information to generate tables for iconv. Update from db-2.3.14. * db2/Makefile: Updated. * db2/config.h: Likewise. * db2/db.h: Likewise. * db2/db_int.h: Likewise. * db2/btree/bt_cursor.c: Likewise. * db2/btree/bt_delete.c: Likewise. * db2/btree/bt_put.c: Likewise. * db2/btree/bt_search.c: Likewise. * db2/btree/bt_split.c: Likewise. * db2/btree/btree_auto.c: Likewise. * db2/common/db_appinit.c: Likewise. * db2/common/db_apprec.c: Likewise. * db2/common/db_err.c: Likewise. * db2/common/db_region.c: Likewise. * db2/db/db_auto.c: Likewise. * db2/db/db_dispatch.c: Likewise. * db2/db/db_ret.c: Likewise. * db2/dbm/dbm.c: Likewise. * db2/hash/hash_auto.c: Likewise. * db2/include/btree_ext.h: Likewise. * db2/include/common_ext.h: Likewise. * db2/include/db.h.src: Likewise. * db2/include/db_cxx.h: Likewise. * db2/include/db_ext.h: Likewise. * db2/include/db_int.h.src: Likewise. * db2/include/lock.h: Likewise. * db2/include/log.h: Likewise. * db2/include/mp.h: Likewise. * db2/include/mp_ext.h: Likewise. * db2/include/os_ext.h: Likewise. * db2/include/os_func.h: Likewise. * db2/lock/lock.c: Likewise. * db2/lock/lock_deadlock.c: Likewise. * db2/log/log.c: Likewise. * db2/log/log_archive.c: Likewise. * db2/log/log_auto.c: Likewise. * db2/log/log_get.c: Likewise. * db2/log/log_put.c: Likewise. * db2/mp/mp_bh.c: Likewise. * db2/mp/mp_fget.c: Likewise. * db2/mp/mp_fopen.c: Likewise. * db2/mp/mp_fput.c: Likewise. * db2/mp/mp_fset.c: Likewise. * db2/mp/mp_open.c: Likewise. * db2/mp/mp_pr.c: Likewise. * db2/mp/mp_region.c: Likewise. * db2/mp/mp_sync.c: Likewise. * db2/mutex/README: Likewise. * db2/mutex/mutex.c: Likewise. * db2/os/os_open.c: Likewise. * db2/os/os_func.c: Removed. * db2/os/os_config.c: New file. * db2/os/os_spin.c: New file. * db2/txn/txn.c: Likewise. * db2/txn/txn_auto.c: Likewise. 1997-11-30 06:01 Ulrich Drepper <drepper@cygnus.com> * posix/sys/wait.h (__WAIT_INT): Don't use complex version with __typeof for C++ since this fails for class members. Reported by Neal Becker <neal@ctd.comsat.com>. 1997-11-28 11:21 Zack Weinberg <zack@rabi.phys.columbia.edu> * configure.in: Check for a working makeinfo (3.11 or better). * config.make.in: Add MAKEINFO to be substituted. * manual/Makefile: Don't update info if makeinfo is too old. 1997-11-30 05:21 Ulrich Drepper <drepper@cygnus.com> * sysdeps/alpha/setjmp.S: Define _ASM and _SETJMP_H to get definitions. * sysdeps/alpha/__longjmp.S: Likewise. * sysdeps/unix/sysv/linux/alpha/kernel_termios.h: Include <termios.h> not <bits/termios.h>. * sysdeps/unix/sysv/linux/alpha/syscalls.list: Define syscall as __llseek and make llseek and lseek64 weak aliases. * sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list: Likewise. Patches by a sun <asun@zoology.washington.edu>. 1997-11-29 19:19 Zack Weinberg <zack@rabi.phys.columbia.edu> * misc/sys/syslog.h: Delete KERNEL preprocessor conditional. * sysdeps/unix/sysv/linux/powerpc/bits/termios.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/termios.h: Likewise. * misc/sys/syslog.h: Clean up BSD header. 1997-11-29 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/bits/in.h: Add changes from Linux 2.1.67. * sysdeps/libm-ieee754/s_ctan.c (__ctan): Raise invalid exception for ctan(+-inf,x). * sysdeps/libm-ieee754/s_ctanl.c (__ctanl): Likewise. * sysdeps/libm-ieee754/s_ctanf.c (__ctanf): Likewise. * math/libm-test.c (csqrt_test): Add tests for cabs, carg, ctan, csqrt (-1), ctanh(i*pi/4). 1997-11-26 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/generic/bits/confname.h: Fix comma in enumerator. 1997-11-28 13:28 Philip Blundell <Philip.Blundell@pobox.com> * sysdeps/unix/sysv/linux/net/if_arp.h: Add more ARPHRD_ constants. 1997-11-26 Andreas Jaeger <aj@arthur.rhein-neckar.de> * wcsmbs/wcrtomb.c (__wcrtomb): Remove unused variable fake. 1997-11-26 21:28 Ulrich Drepper <drepper@cygnus.com> * sysdeps/posix/getcwd.c (GETCWD_STORYGE_CLASS): Remove definition and use. Define GETCWD_RETURN_TYPE instead and use it. * sysdeps/unix/sysv/linux/getcwd.c: Define GETCWD_RETURN_TYPE instead of GETCWD_STORYGE_CLASS and put the return type and the `internal_function' in the right order for gcc 2.7.2. 1997-11-26 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/sys/module.h: Remove file. It's incompatible with Linux 2.1.x. Packages using modules (e.g. modutils) should/do provide their own version. Suggested by Richard Henderson. * sysdeps/unix/sysv/linux/Dist: Remove sys/module.h. * sysdeps/unix/sysv/linux/Makefile (sysdep_headers) [$(subdir)=socket]: Remove sys/module.h. * libio/stdio.h: Correct comment of sys_nerr/sys_errlist.
164 lines
3.7 KiB
C
164 lines
3.7 KiB
C
/*-
|
|
* See the file LICENSE for redistribution information.
|
|
*
|
|
* Copyright (c) 1996, 1997
|
|
* Sleepycat Software. All rights reserved.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#ifndef lint
|
|
static const char sccsid[] = "@(#)db_ret.c 10.10 (Sleepycat) 11/28/97";
|
|
#endif /* not lint */
|
|
|
|
#ifndef NO_SYSTEM_INCLUDES
|
|
#include <sys/types.h>
|
|
|
|
#include <errno.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#endif
|
|
|
|
#include "db_int.h"
|
|
#include "db_page.h"
|
|
#include "btree.h"
|
|
#include "hash.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);
|
|
}
|