mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-14 07:10:05 +00:00
6d52618b15
Thu Dec 19 23:28:33 1996 Ulrich Drepper <drepper@cygnus.com> * resolv/resolv.h: Update from BIND 4.9.5-P1. * resolv/res_comp.c: Likewise. * resolv/res_debug.c: Likewise. * resolv/Banner: Update version number. Thu Dec 19 20:58:53 1996 Ulrich Drepper <drepper@cygnus.com> * elf/dlfcn.h: Add extern "C" wrapper. * io/utime.h: Don't define NULL since this isn't allowed in POSIX. * io/sys/stat.h: Declare `lstat' only if __USE_BSD || __USE_XOPEN_EXTENDED. * locale/locale.h: Define NULL. * math/math.c: Don't include <errno.h> to define math errors. * stdlib/stdlib.h: Likewise. * posix/unistd.h: Don't declare environ. * posix/sys/utsname.h (struct utsname): Declare member domainname as __domainname is !__USE_GNU. * signal/signal.h: Declare size_t only if __USE_BSD || __USE_XOPEN_EXTENDED. * stdio/stdio.h: Don't declare cuserid when __USE_POSIX, but instead when __USE_XOPEN. * string/string.h: Define strndup only if __USE_GNU. * sysdeps/unix/sysv/linux/clock.c: New file. * sysdeps/unix/sysv/linux/timebits.h: Define CLOCKS_PER_SEC as 1000000 per X/Open standard. * features.h: Add code to recognize _POSIX_C_SOURCE value 199309. Define __USE_POSIX199309. * posix/unistd.h: Declare fdatasync only if __USE_POSIX199309. * time/time.c: Declare nanosleep only if __USE_POSIX199309. Patches by Rüdiger Helsch <rh@unifix.de>. * locale/locale.h: Add declaration of newlocale and freelocale. * new-malloc/Makefile (distibute): Add mtrace.awk. (dist-routines): Add mcheck and mtrace. (install-lib, non-lib.a): Define as libmcheck.a. * new-malloc/malloc.h: Add declaration of __malloc_initialized. * new-malloc/mcheck.c: New file. * new-malloc/mcheck.h: New file. * new-malloc/mtrace.c: New file. * new-malloc/mtrace.awk: New file. * posix/unistd.h: Correct prototype for usleep. * sysdeps/unix/bsd/usleep.c: De-ANSI-declfy. Correct return type. * sysdeps/unix/sysv/linux/usleep.c: Real implementation based on nanosleep. * signal/signal.h: Change protoype of __sigpause to take two arguments. Remove prototype for sigpause. Add two different macros named sigpause selected when __USE_BSD or __USE_XOPEN are defined. This is necessary since the old BSD definition of theis function collides with the X/Open definition. * sysdeps/posix/sigpause.c: Change function definition to also fit X/Open definition. * sysdeps/libm-i387/e_exp.S: Make sure stack is empty when the function is left. * sysdeps/libm-i387/e_expl.S: Likewise. Patch by HJ Lu. 1996-12-17 Paul Eggert <eggert@twinsun.com> * many, many files: Spelling corrections. * catgets/catgetsinfo.h (mmapped): Renamed from mmaped (in struct catalog_info.status). * mach/err_kern.sub (err_codes_unix), string/stratcliff.c (main): Fix spelling in message. * po/libc.pot: Fix spelling in message for `zic'; this anticipates a fix in the tzcode distribution. Wed Dec 18 15:48:02 1996 Ulrich Drepper <drepper@cygnus.com> * time/strftime.c: Implement ^ flag to cause output be converted to use upper case characters. * time/zic.c: Update from ADO tzcode1996n. Wed Dec 18 14:29:24 1996 Erik Naggum <erik@naggum.no> * time/strftime.c (add): Don't change global `i' until all is over. Define NULL is not already defined. Tue Dec 17 09:49:03 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * libio/iovsprintf.c (_IO_vsprintf): Change `&sf' to `&sf._sbf._f' to avoid the need for a cast. * libio/iovsscanf.c (_IO_vsscanf): Likewise. * sunrpc/rpc/xdr.h: Add prototype for xdr_free.
123 lines
3.8 KiB
C
123 lines
3.8 KiB
C
/*-
|
|
* Copyright (c) 1990, 1993, 1994
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#if defined(LIBC_SCCS) && !defined(lint)
|
|
static char sccsid[] = "@(#)rec_utils.c 8.6 (Berkeley) 7/16/94";
|
|
#endif /* LIBC_SCCS and not lint */
|
|
|
|
#include <sys/param.h>
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include <db.h>
|
|
#include "recno.h"
|
|
|
|
/*
|
|
* __rec_ret --
|
|
* Build return data.
|
|
*
|
|
* Parameters:
|
|
* t: tree
|
|
* e: key/data pair to be returned
|
|
* nrec: record number
|
|
* key: user's key structure
|
|
* data: user's data structure
|
|
*
|
|
* Returns:
|
|
* RET_SUCCESS, RET_ERROR.
|
|
*/
|
|
int
|
|
__rec_ret(t, e, nrec, key, data)
|
|
BTREE *t;
|
|
EPG *e;
|
|
recno_t nrec;
|
|
DBT *key, *data;
|
|
{
|
|
RLEAF *rl;
|
|
void *p;
|
|
|
|
if (key == NULL)
|
|
goto dataonly;
|
|
|
|
/* We have to copy the key, it's not on the page. */
|
|
if (sizeof(recno_t) > t->bt_rkey.size) {
|
|
p = (void *)(t->bt_rkey.data == NULL ?
|
|
malloc(sizeof(recno_t)) :
|
|
realloc(t->bt_rkey.data, sizeof(recno_t)));
|
|
if (p == NULL)
|
|
return (RET_ERROR);
|
|
t->bt_rkey.data = p;
|
|
t->bt_rkey.size = sizeof(recno_t);
|
|
}
|
|
memmove(t->bt_rkey.data, &nrec, sizeof(recno_t));
|
|
key->size = sizeof(recno_t);
|
|
key->data = t->bt_rkey.data;
|
|
|
|
dataonly:
|
|
if (data == NULL)
|
|
return (RET_SUCCESS);
|
|
|
|
/*
|
|
* We must copy big keys/data to make them contiguous. Otherwise,
|
|
* leave the page pinned and don't copy unless the user specified
|
|
* concurrent access.
|
|
*/
|
|
rl = GETRLEAF(e->page, e->index);
|
|
if (rl->flags & P_BIGDATA) {
|
|
if (__ovfl_get(t, rl->bytes,
|
|
&data->size, &t->bt_rdata.data, &t->bt_rdata.size))
|
|
return (RET_ERROR);
|
|
data->data = t->bt_rdata.data;
|
|
} else if (F_ISSET(t, B_DB_LOCK)) {
|
|
/* Use +1 in case the first record retrieved is 0 length. */
|
|
if (rl->dsize + 1 > t->bt_rdata.size) {
|
|
p = (void *)(t->bt_rdata.data == NULL ?
|
|
malloc(rl->dsize + 1) :
|
|
realloc(t->bt_rdata.data, rl->dsize + 1));
|
|
if (p == NULL)
|
|
return (RET_ERROR);
|
|
t->bt_rdata.data = p;
|
|
t->bt_rdata.size = rl->dsize + 1;
|
|
}
|
|
memmove(t->bt_rdata.data, rl->bytes, rl->dsize);
|
|
data->size = rl->dsize;
|
|
data->data = t->bt_rdata.data;
|
|
} else {
|
|
data->size = rl->dsize;
|
|
data->data = rl->bytes;
|
|
}
|
|
return (RET_SUCCESS);
|
|
}
|