mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-20 09:41:18 +00:00
a5a0310d8e
1997-09-30 18:03 Ulrich Drepper <drepper@cygnus.com> * Makerules: Undo last change. * csu/Makefile: Define before-compile at the right place. * aclocal.m4: Remove a.out file created by assembler test. * set-init.c: Find set-hooks.h using <...>. Update to db 2.3.10. * db2/Makefile: Update. * db2/db.h: Likewise. * db2/db_185.h: Likewise. * db2/db_int.h: Likewise. * db2/btree/bt_close.c: Likewise. * db2/btree/bt_conv.c: Likewise. * db2/btree/bt_cursor.c: Likewise. * db2/btree/bt_put.c: Likewise. * db2/btree/bt_rec.c: Likewise. * db2/btree/bt_recno.c: Likewise. * db2/btree/btree.src: Likewise. * db2/btree/btree_auto.c: Likewise. * db2/clib/getlong.c: Likewise. * db2/db/db.c: Likewise. * db2/db/db_auto.c: Likewise. * db2/db/db_conv.c: Likewise. * db2/db/db_pr.c: Likewise. * db2/db/db_ret.c: Likewise. * db2/db/db_thread.c: Likewise. * db2/hash/hash.c: Likewise. * db2/hash/hash_auto.c: Likewise. * db2/hash/hash_conv.c: Likewise. * db2/hash/hash_dup.c: Likewise. * db2/hash/hash_func.c: Likewise. * db2/hash/hash_page.c: Likewise. * db2/hash/hash_rec.c: Likewise. * db2/include/btree.h: Likewise. * db2/include/btree_ext.h: Likewise. * db2/include/db.h.src: Likewise. * db2/include/db_185.h.src: Likewise. * db2/include/db_cxx.h: Likewise. * db2/include/db_ext.h: Likewise. * db2/include/db_int.h.src: Likewise. * db2/include/db_page.h: Likewise. * db2/include/db_shash.h: Likewise. * db2/include/lock.h: Likewise. * db2/include/log.h: Likewise. * db2/include/log_ext.h: Likewise. * db2/include/mp.h: Likewise. * db2/include/shqueue.h: Likewise. * db2/include/txn.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/log/log_register.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/mutex/mutex.c: Likewise. * db2/os/db_os_dir.c: Likewise. * db2/progs/db_checkpoint/db_checkpoint.c: Likewise. * db2/progs/db_deadlock/db_deadlock.c: Likewise. * db2/progs/db_dump185/db_dump185.c: Likewise. * db2/progs/db_load/db_load.c: Likewise. * db2/progs/db_recover/db_recover.c: Likewise. * db2/txn/txn.c: Likewise. * db2/txn/txn_auto.c: Likewise. * elf/link.h: Define struct libname_list outside struct link_map to not confuse C++ compilers. * include/features.h: Recognize _XOPEN_SOURCE == 500 and set __USE_UNIX98. * manual/creature.texi: Explain this. * libc.map: Add new functions. * libio/Makefile (routines): Add fseeko and ftello. * libio/ftello.c: New file. * libio/fseeko.c: New file. * libio/stdio.h: Add prototypes for new functions. * manual/stdio.texi: Document fseeko and ftello. * posix/Makefile (routines): Add pread and pwrite. * sysdeps/posix/pread.c: New file. * sysdeps/posix/pwrite.c: New file. * sysdeps/stub/pread.c: New file. * sysdeps/stub/pwrite.c: New file. * posix/unistd.h: Add prototypes for pread and pwrite. Pretty print header. Define gid_t, uid_t, off_t, pid_t if __USE_UNIX98. Declare ctermid and cuserid if __USE_UNIX98. (swab): Change to take void * arguments. * string/swab.c: Change parameter to void *. * posix/sys/types: Define gid_t, uid_t, off_t, pid_t only if not already happened. * manual/llio.texi: Document pread and pwrite. * string/strings.h: Don't simply include string.h. Define BSD functions according to Unix98. * stdlib/tst-strtol.c: Include <string.h> not <strings.h>. * sunrpc/clnt_simp.c: Likewise. * malloc/Makefile (aux): Add set-freeres. * malloc/mtrace.c: Define function release_libc_mem which calls the __libc_subfreeres handler. (mtrace): Register release_libc_mem. * malloc/set-freeres.c: New file. * intl/dcgettext.c: Define free_mem function and add to __libc_subfreeres list. * intl/finddomain.c: Likewise. * intl/gettextP.h (struct loaded_domain): Add new fields use_mmap and mmap_size. Add prototype for _nl_unloaded_domain. * intl/loadmsgcat.c: Define new function _nl_unload_domain. (_nl_load_domain): Store informaiton about mmap use and file size. * intl/localealias.c (read_alias_file): Optimize locale alias file reading by avoid frequen mallocs. Define free_mem function and add to __libc_subfreeres list. * locale/localeinfo.h: Make a difference between MAX_USAGE_COUNT and undeletable. Add prototype for _nl_unload_locale. * locale/C-collate: Mark data as undeletable by using UNDELETABLE. * locale/C-ctype: Likewise. * locale/C-messages: Likewise. * locale/C-monetary: Likewise. * locale/C-numeric: Likewise. * locale/C-time: Likewise. * locale/findlocale.c (_nl_find_locale, _nl_remove_locale): Handle MAX_USAGE_COUNT and UNDELETABLE. (free_mem): New function. Add it to __libc_subfreeres list. * locale/loadlocale.c: Define _nl_unload_locale function. * misc/hsearch.c: Register hdestroy in __libc_subfreeres list. * stdlib/fmtmsg.c (addseverity): Handle illegal severity arguments correctly Define free_mem function and add to __libc_subfreeres list. * locale/programs/localedef.c (options): short form os verbose is v. Reported by Andreas Jaeger. * misc/sys/select.h: Define pselect only is __USE_POSIX since this header is used in some others as well for historical reasons. * resolv/resolv.h: Include <netinet/in.h> to make self-contained. * string/bits/string2.h: Add missing braces and optimize strcmp a bit more. * sysdeps/i386/i486/bits/string.h: Likewise. * sunrpc/rpc/auth_des.h: Include rpc/auth.h to be self-contained. Pretty print. * sysdeps/mach/hurd/cthreads.c: Add copyright text. * sysdeps/unix/sysv/linux/syscalls.list: Correct prctl entry. * sysdeps/unix/sysv/linux/sys/mman.h: Get definition of size_t. * time/time.h: Pretty print. 1997-09-29 Paul Eggert <eggert@twinsun.com> * time/strftime.c: Synchronize with GNU Emacs strftime.c. (HAVE_MEMCPY): Define if emacs is defined and HAVE_BCOPY isn't. (gmtime_r, localtime_r): Undef before defining. (iso_week_days): Use __inline__, not inline. 1997-09-27 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/fpu/bits/mathinline.h: Rename exp2{,l,f} to __ieee754_exp2{,l,f}. * sysdeps/m68k/fpu/s_exp2.c: Likewise. * sysdeps/m68k/fpu/s_exp2l.c: Likewise. * sysdeps/m68k/fpu/s_exp2f.c: Likewise. 1997-09-27 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * elf/soinit.c (__EH_FRAME_BEGIN__): Don't make the .eh_frame section read-only, it contains relocations. * elf/sofini.c (__FRAME_END__): Likewise. 1997-09-29 03:08 Ulrich Drepper <drepper@cygnus.com> * sysdeps/i386/i486/bits/string.h [__PIC__] (__strspn_cg, __strcspn_cg, __strpbrk_cg, __strstr_cg): Optimize even more. No spill register needed. Patch by NIIBE Yutaka <gniibe@mri.co.jp>. 1997-09-28 08:27 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/nis_call.c (__do_niscall2): Fix return code, add missing break in switch case. * nis/nis_mkdir.c: Fix return codes to match Solaris version. * nis/nis_rmdir.c: Likewise. * nis/rpcsvc/yp_prot.h: Rename struct keydat to struct keydat_t for C++. 1997-09-28 04:32 Ulrich Drepper <drepper@cygnus.com> * configure.in: Fix typo. Patch by Zack Weinberg <zack@rabi.phys.columbia.edu>. 1997-09-25 20:14 Philip Blundell <Philip.Blundell@pobox.com> * sysdeps/unix/sysv/linux/scsi/sg.h: New file. * sysdeps/unix/sysv/linux/Makefile: Install <scsi/sg.h>.
244 lines
5.6 KiB
C
244 lines
5.6 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.
|
|
*
|
|
* 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[] = "@(#)db_conv.c 10.7 (Sleepycat) 9/21/97";
|
|
#endif /* not lint */
|
|
|
|
#ifndef NO_SYSTEM_INCLUDES
|
|
#include <sys/types.h>
|
|
|
|
#include <errno.h>
|
|
#endif
|
|
|
|
#include "db_int.h"
|
|
#include "db_page.h"
|
|
#include "db_swap.h"
|
|
#include "db_am.h"
|
|
|
|
static int __db_convert __P((db_pgno_t, void *, size_t, int));
|
|
|
|
/*
|
|
* __db_pgin --
|
|
*
|
|
* PUBLIC: int __db_pgin __P((db_pgno_t, size_t, void *));
|
|
*/
|
|
int
|
|
__db_pgin(pg, pagesize, pp)
|
|
db_pgno_t pg;
|
|
size_t pagesize;
|
|
void *pp;
|
|
{
|
|
return (__db_convert(pg, pp, pagesize, 1));
|
|
}
|
|
|
|
/*
|
|
* __db_pgout --
|
|
*
|
|
* PUBLIC: int __db_pgout __P((db_pgno_t, size_t, void *));
|
|
*/
|
|
int
|
|
__db_pgout(pg, pagesize, pp)
|
|
db_pgno_t pg;
|
|
size_t pagesize;
|
|
void *pp;
|
|
{
|
|
return (__db_convert(pg, pp, pagesize, 0));
|
|
}
|
|
|
|
/*
|
|
* __db_convert --
|
|
* Actually convert a page.
|
|
*/
|
|
static int
|
|
__db_convert(pg, pp, pagesize, pgin)
|
|
db_pgno_t pg; /* Unused, but left for the future. */
|
|
void *pp;
|
|
size_t pagesize;
|
|
int pgin;
|
|
{
|
|
BINTERNAL *bi;
|
|
BKEYDATA *bk;
|
|
BOVERFLOW *bo;
|
|
PAGE *h;
|
|
RINTERNAL *ri;
|
|
db_indx_t i, len, tmp;
|
|
u_int8_t *p, *end;
|
|
|
|
h = pp;
|
|
if (pgin) {
|
|
M_32_SWAP(h->lsn.file);
|
|
M_32_SWAP(h->lsn.offset);
|
|
M_32_SWAP(h->pgno);
|
|
M_32_SWAP(h->prev_pgno);
|
|
M_32_SWAP(h->next_pgno);
|
|
M_16_SWAP(h->entries);
|
|
M_16_SWAP(h->hf_offset);
|
|
}
|
|
|
|
switch (h->type) {
|
|
case P_HASH:
|
|
for (i = 0; i < NUM_ENT(h); i++) {
|
|
if (pgin)
|
|
M_16_SWAP(h->inp[i]);
|
|
|
|
switch (HPAGE_TYPE(h, i)) {
|
|
case H_KEYDATA:
|
|
break;
|
|
case H_DUPLICATE:
|
|
len = LEN_HKEYDATA(h, pagesize, i);
|
|
p = HKEYDATA_DATA(P_ENTRY(h, i));
|
|
for (end = p + len; p < end;) {
|
|
if (pgin) {
|
|
P_16_SWAP(p);
|
|
memcpy(&tmp,
|
|
p, sizeof(db_indx_t));
|
|
p += sizeof(db_indx_t);
|
|
} else {
|
|
memcpy(&tmp,
|
|
p, sizeof(db_indx_t));
|
|
SWAP16(p);
|
|
}
|
|
p += tmp;
|
|
SWAP16(p);
|
|
}
|
|
break;
|
|
case H_OFFDUP:
|
|
p = HOFFPAGE_PGNO(P_ENTRY(h, i));
|
|
SWAP32(p); /* pgno */
|
|
break;
|
|
case H_OFFPAGE:
|
|
p = HOFFPAGE_PGNO(P_ENTRY(h, i));
|
|
SWAP32(p); /* pgno */
|
|
SWAP32(p); /* tlen */
|
|
break;
|
|
}
|
|
|
|
}
|
|
if (!pgin)
|
|
for (i = 0; i < NUM_ENT(h); i++)
|
|
M_16_SWAP(h->inp[i]);
|
|
break;
|
|
case P_LBTREE:
|
|
case P_LRECNO:
|
|
case P_DUPLICATE:
|
|
for (i = 0; i < NUM_ENT(h); i++) {
|
|
if (pgin)
|
|
M_16_SWAP(h->inp[i]);
|
|
|
|
bk = GET_BKEYDATA(h, i);
|
|
switch (B_TYPE(bk->type)) {
|
|
case B_KEYDATA:
|
|
M_16_SWAP(bk->len);
|
|
break;
|
|
case B_DUPLICATE:
|
|
case B_OVERFLOW:
|
|
bo = (BOVERFLOW *)bk;
|
|
M_32_SWAP(bo->tlen);
|
|
M_32_SWAP(bo->pgno);
|
|
break;
|
|
}
|
|
|
|
if (!pgin)
|
|
M_16_SWAP(h->inp[i]);
|
|
}
|
|
break;
|
|
case P_IBTREE:
|
|
for (i = 0; i < NUM_ENT(h); i++) {
|
|
if (pgin)
|
|
M_16_SWAP(h->inp[i]);
|
|
|
|
bi = GET_BINTERNAL(h, i);
|
|
switch (B_TYPE(bi->type)) {
|
|
case B_KEYDATA:
|
|
M_16_SWAP(bi->len);
|
|
M_32_SWAP(bi->pgno);
|
|
M_32_SWAP(bi->nrecs);
|
|
break;
|
|
case B_DUPLICATE:
|
|
case B_OVERFLOW:
|
|
bo = (BOVERFLOW *)bi;
|
|
M_32_SWAP(bo->tlen);
|
|
M_32_SWAP(bo->pgno);
|
|
break;
|
|
}
|
|
|
|
if (!pgin)
|
|
M_16_SWAP(h->inp[i]);
|
|
}
|
|
break;
|
|
case P_IRECNO:
|
|
for (i = 0; i < NUM_ENT(h); i++) {
|
|
if (pgin)
|
|
M_16_SWAP(h->inp[i]);
|
|
|
|
ri = GET_RINTERNAL(h, i);
|
|
M_32_SWAP(ri->pgno);
|
|
M_32_SWAP(ri->nrecs);
|
|
|
|
if (!pgin)
|
|
M_16_SWAP(h->inp[i]);
|
|
}
|
|
case P_OVERFLOW:
|
|
case P_INVALID:
|
|
/* Nothing to do. */
|
|
break;
|
|
default:
|
|
return (EINVAL);
|
|
}
|
|
|
|
if (!pgin) {
|
|
/* Swap the header information. */
|
|
M_32_SWAP(h->lsn.file);
|
|
M_32_SWAP(h->lsn.offset);
|
|
M_32_SWAP(h->pgno);
|
|
M_32_SWAP(h->prev_pgno);
|
|
M_32_SWAP(h->next_pgno);
|
|
M_16_SWAP(h->entries);
|
|
M_16_SWAP(h->hf_offset);
|
|
}
|
|
return (0);
|
|
}
|