mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-09 04:11:27 +08:00
26b4d76671
1997-09-05 03:15 Ulrich Drepper <drepper@cygnus.com> * Makefile (subdirs): Reorganize order so that nss follows add-ons. * config.make.in (LDAP): Add. * configure.in: Prepare for ldap add-on. * shlib-versions: Add version numbers for ldap NSS module. * nss/Makefile: Add rules to build ldap NSS module. * db/btree/bt_page.c (__bt_free): Update meta data information. Update db from db-2.3.6. * db2/db.h: Updated. * db2/btree/bt_close.c: Updated. * db2/btree/bt_compare.c: Updated. * db2/btree/bt_conv.c: Updated. * db2/btree/bt_cursor.c: Updated. * db2/btree/bt_delete.c: Updated. * db2/btree/bt_put.c: Updated. * db2/btree/bt_rec.c: Updated. * db2/btree/bt_recno.c: Updated. * db2/btree/bt_search.c: Updated. * db2/btree/bt_split.c: Updated. * db2/btree/bt_stat.c: Updated. * db2/common/db_appinit.c: Updated. * db2/common/db_apprec.c: Updated. * db2/common/db_byteorder.c: Updated. * db2/common/db_err.c: Updated. * db2/common/db_region.c: Updated. * db2/db/db.c: Updated. * db2/db/db_conv.c: Updated. * db2/db/db_dup.c: Updated. * db2/db/db_pr.c: Updated. * db2/db/db_ret.c: Updated. * db2/db185/db185.c: Updated. * db2/dbm/dbm.c: Updated. * db2/hash/hash_dup.c: Updated. * db2/include/db_am.h: Updated. * db2/include/db_page.h: Updated. * db2/include/mp.h: Updated. * db2/include/queue.h: Updated. * db2/log/log.c: Updated. * db2/log/log_findckp.c: Updated. * db2/log/log_get.c: Updated. * db2/log/log_rec.c: Updated. * db2/mp/mp_bh.c: Updated. * db2/mp/mp_fopen.c: Updated. * db2/mp/mp_pr.c: Updated. * db2/mp/mp_sync.c: Updated. * db2/mutex/x86.gcc: Updated. * db2/os/db_os_dir.c: Updated. * db2/os/db_os_fid.c: Updated. * db2/progs/db_archive/db_archive.c: Updated. * db2/progs/db_checkpoint/db_checkpoint.c: Updated. * db2/progs/db_deadlock/db_deadlock.c: Updated. * db2/progs/db_dump/db_dump.c: Updated. * db2/progs/db_dump185/db_dump185.c: Updated. * db2/progs/db_load/db_load.c: Updated. * db2/progs/db_printlog/db_printlog.c: Updated. * db2/progs/db_recover/db_recover.c: Updated. * db2/progs/db_stat/db_stat.c: Updated. * db2/txn/txn.c: Updated. * db2/txn/txn_rec.c: Updated. * db2/Makefile: Add rule to build db_printlog. * db2/config.h: Don't include endian.h and don't define WORDS_BIGENDIAN. Only define HAVE_ENDIAN_H. * elf/dl-open.c (_dl_open): Make thread-safe. * elf/dl-close.c (_dl_close): Likewise. * elf/dlclose.c: Pretty print. * elf/dl-version.c (make_string): Use __strdup not strdup. (find_needed): Don't use l_searchlist of _dl_loaded, use the l_next list. * elf/dl-deps.c (_dl_map_object_deps): Remove variable head. * manual/math.texi: Add note about == and != for FP values. * manual/message.texi: Mention problems with relative paths and binstextdomain. * manual/string.texi: Mark strdupa and strndupa correctly as macros. * sunrpc/Makefile (CFLAGS-xkey_prot.c): Define to prevent warnings. * sunrpc/rpc_cout.c: Avoid needless races around return value. * sysdeps/generic/stpcpy.c: Include <config.h> if wanted. Update from tzdata-1997h. * time/africa: Updated. * time/europe: Updated. * time/iso3166.tab: Updated. * time/northamerica: Updated. * time/southamerica: Updated. * time/zone.tab: Updated. 1997-09-04 13:19 Richard Henderson <rth@cygnus.com> * sysdeps/alpha/w_sqrt.S: Removed. * sysdeps/alpha/fpu/e_sqrt.c: New. Obey -mieee and -mieee-with-inexact and build a version that is as fast as possible given the constraint. 1997-08-30 Andreas Jaeger <aj@arthur.rhein-neckar.de> * manual/maint.texi: Document some defaults for configuration parameters. 1997-09-04 15:57 Ulrich Drepper <drepper@cygnus.com> * termios/cfsetspeed.c (cfsetspeed): Change return value to int. * termios/termios.h: Change prototype accordingly. Reported by Andreas Jaeger <aj@arthur.rhein-neckar.de>. 1997-07-26 14:42 H.J. Lu <hjl@gnu.ai.mit.edu> * libio/stdfiles.c (_libio_using_thunks): Define if _G_USING_THUNKS is defined. * libio/_G_config.h: Moved to ... * sysdeps/generic/_G_config.h: ...here. * sysdeps/unix/sysv/linux/_G_config.h: New, Add vtable thunks support. 1997-09-02 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/Makefile (pic-ccflag): Override it for more efficient code (together with a change in gcc). * Makeconfig (pic-ccflag): New variable. (CFLAGS-.os): Use it instead of hardcoding -fPIC. 1997-09-02 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/dl-machine.h (elf_machine_load_address): Use _dl_start instead of a local label, to avoid getting an unreadable label name. 1997-09-02 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * nss/Makefile ($(objpfx)libnss_db.so): Use $(dbobjdir) to find libdb.so. * Makeconfig (dbobjdir): Use db2. 1997-08-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * manual/maint.texi (Porting to Unix): Update description of the implementation of Unix system calls. (Contributors): Use real umlaut in tege's name. 1997-08-30 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/libm-ieee754/w_gamma.c: Make compilable with _IEEE_LIBM. * sysdeps/libm-ieee754/w_gammaf.c: Likewise. * sysdeps/libm-ieee754/w_gammal.c: Likewise.
206 lines
5.5 KiB
C
206 lines
5.5 KiB
C
/*-
|
|
* See the file LICENSE for redistribution information.
|
|
*
|
|
* Copyright (c) 1996, 1997
|
|
* Sleepycat Software. All rights reserved.
|
|
*/
|
|
/*
|
|
* Copyright (c) 1990, 1993, 1994, 1995, 1996
|
|
* Keith Bostic. All rights reserved.
|
|
*/
|
|
/*
|
|
* Copyright (c) 1990, 1993, 1994, 1995
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* This code is derived from software contributed to Berkeley by
|
|
* Mike Olson.
|
|
*
|
|
* 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[] = "@(#)bt_compare.c 10.4 (Sleepycat) 9/3/97";
|
|
#endif /* not lint */
|
|
|
|
#ifndef NO_SYSTEM_INCLUDES
|
|
#include <sys/types.h>
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#endif
|
|
|
|
#include "db_int.h"
|
|
#include "db_page.h"
|
|
#include "btree.h"
|
|
|
|
/*
|
|
* __bam_cmp --
|
|
* Compare a key to a given record.
|
|
*
|
|
* PUBLIC: int __bam_cmp __P((DB *, const DBT *, EPG *));
|
|
*/
|
|
int
|
|
__bam_cmp(dbp, k1, e)
|
|
DB *dbp;
|
|
const DBT *k1;
|
|
EPG *e;
|
|
{
|
|
BINTERNAL *bi;
|
|
BKEYDATA *bk;
|
|
BOVERFLOW *bo;
|
|
BTREE *t;
|
|
DBT k2;
|
|
PAGE *h;
|
|
|
|
t = dbp->internal;
|
|
|
|
/*
|
|
* Returns:
|
|
* < 0 if k1 is < record
|
|
* = 0 if k1 is = record
|
|
* > 0 if k1 is > record
|
|
*
|
|
* The left-most key on internal pages, at any level of the tree, is
|
|
* guaranteed, by the following code, to be less than any user key.
|
|
* This saves us from having to update the leftmost key on an internal
|
|
* page when the user inserts a new key in the tree smaller than
|
|
* anything we've yet seen.
|
|
*/
|
|
h = e->page;
|
|
if (e->indx == 0 &&
|
|
h->prev_pgno == PGNO_INVALID && TYPE(h) != P_LBTREE)
|
|
return (1);
|
|
|
|
bo = NULL;
|
|
if (TYPE(h) == P_LBTREE) {
|
|
bk = GET_BKEYDATA(h, e->indx);
|
|
if (B_TYPE(bk->type) == B_OVERFLOW)
|
|
bo = (BOVERFLOW *)bk;
|
|
else {
|
|
memset(&k2, 0, sizeof(k2));
|
|
k2.data = bk->data;
|
|
k2.size = bk->len;
|
|
}
|
|
} else {
|
|
bi = GET_BINTERNAL(h, e->indx);
|
|
if (B_TYPE(bi->type) == B_OVERFLOW)
|
|
bo = (BOVERFLOW *)(bi->data);
|
|
else {
|
|
memset(&k2, 0, sizeof(k2));
|
|
k2.data = bi->data;
|
|
k2.size = bi->len;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* XXX
|
|
* We ignore system errors; the only recoverable one is ENOMEM, and we
|
|
* don't want to require that comparison routines handle random errors.
|
|
* We don't want to return a valid comparison, either, so we stop.
|
|
*/
|
|
if (bo != NULL) {
|
|
/*
|
|
* If using the default comparison routine, use __db_moff(),
|
|
* which compares the overflow key a page at a time.
|
|
*/
|
|
if (t->bt_compare == __bam_defcmp)
|
|
return (__db_moff(dbp, k1, bo->pgno));
|
|
|
|
/*
|
|
* Otherwise, we need a contiguous record so we can hand it
|
|
* to the user's routine.
|
|
*/
|
|
if (__db_goff(dbp, &k2, bo->tlen,
|
|
bo->pgno, &t->bt_rdata.data, &t->bt_rdata.ulen) != 0)
|
|
abort();
|
|
}
|
|
return ((*t->bt_compare)(k1, &k2));
|
|
}
|
|
|
|
/*
|
|
* __bam_defcmp --
|
|
* Default comparison routine.
|
|
*
|
|
* PUBLIC: int __bam_defcmp __P((const DBT *, const DBT *));
|
|
*/
|
|
int
|
|
__bam_defcmp(a, b)
|
|
const DBT *a, *b;
|
|
{
|
|
size_t len;
|
|
u_int8_t *p1, *p2;
|
|
|
|
/*
|
|
* Returns:
|
|
* < 0 if a is < b
|
|
* = 0 if a is = b
|
|
* > 0 if a is > b
|
|
*
|
|
* XXX
|
|
* If a size_t doesn't fit into a long, or if the difference between
|
|
* any two characters doesn't fit into an int, this routine can lose.
|
|
* What we need is a signed integral type that's guaranteed to be at
|
|
* least as large as a size_t, and there is no such thing.
|
|
*/
|
|
len = a->size > b->size ? b->size : a->size;
|
|
for (p1 = a->data, p2 = b->data; len--; ++p1, ++p2)
|
|
if (*p1 != *p2)
|
|
return ((long)*p1 - (long)*p2);
|
|
return ((long)a->size - (long)b->size);
|
|
}
|
|
|
|
/*
|
|
* __bam_defpfx --
|
|
* Default prefix routine.
|
|
*
|
|
* PUBLIC: size_t __bam_defpfx __P((const DBT *, const DBT *));
|
|
*/
|
|
size_t
|
|
__bam_defpfx(a, b)
|
|
const DBT *a, *b;
|
|
{
|
|
size_t cnt, len;
|
|
u_int8_t *p1, *p2;
|
|
|
|
cnt = 1;
|
|
len = a->size > b->size ? b->size : a->size;
|
|
for (p1 = a->data, p2 = b->data; len--; ++p1, ++p2, ++cnt)
|
|
if (*p1 != *p2)
|
|
return (cnt);
|
|
|
|
/*
|
|
* We know that a->size must be <= b->size, or they wouldn't be
|
|
* in this order.
|
|
*/
|
|
return (a->size < b->size ? a->size + 1 : a->size);
|
|
}
|