mirror of
https://sourceware.org/git/glibc.git
synced 2024-10-04 04:57:46 +00:00
92f1da4da0
1997-08-10 19:17 Philip Blundell <Philip.Blundell@pobox.com> * nss/nss_db/db-XXX.c: Include <db_185.h> not <db.h>. Somebody should update this to use the new db API. * nss/nss_db/db-netgrp.c: Likewise. * nss/nss_db/db-alias.c: Likewise. * db2/Makefile: Makefile for db-2.x in glibc. 1997-08-27 21:20 Ulrich Drepper <drepper@cygnus.com> * csu/Makefile (before-compile): New goal. Make sure abi-tag.h is generated. [$(elf)=yes] (asm-CPPFLAGS): Make sure abi-tag.h file can be found. * Makeconfig [$(build-omitfp)=yes] (CFLAGS-.o): Add -D__USE_STRING_INLINES. * string/string.f: Move strnlen optimization after inclusion of <bits/string.h>. Include <bits/string.h> only if __USE_STRING_INLINES is defined. * sysdeps/generic/memcpy.c: Undef memcpy to allow macro of this name in <bits/string.h>. * sysdeps/generic/memset.c: Likewise. * sysdeps/i386/string.h: i386 optimized string functions. * sysdeps/i386/i486string.h: i486+ optimized string functions. * Makefile (subdirs): Change db to db2. * shlib-versions: Bump libdb verion number to 3. * include/db.h: Include from db2 directory. * include/db_185.h: New file. * sysdeps/i386/Makefile [$(subdirs)=db2] (CPPFLAGS): Add macros to provide spinlock information for db2. * sysdeps/m68k/m68020/Makefile: New file. Likewise. * sysdeps/sparc/Makefile: New file. Likewise. * sysdeps/unix/sysv/linux/Makefile [$(subdirs)=db2] (CPPFLAGS): Add -DHAVE_LLSEEK. * db2/config.h: Hand-edited config file for db2 in glibc. * db2/compat.h: New file from db-2.3.4. * db2/db.h: Likewise. * db2/db_185.h: Likewise. * db2/db_int.h: Likewise. * db2/makedb.c: Likewise. * db2/btree/bt_close.c: Likewise. * db2/btree/bt_compare.c: Likewise. * db2/btree/bt_conv.c: Likewise. * db2/btree/bt_cursor.c: Likewise. * db2/btree/bt_delete.c: Likewise. * db2/btree/bt_open.c: Likewise. * db2/btree/bt_page.c: Likewise. * db2/btree/bt_put.c: Likewise. * db2/btree/bt_rec.c: Likewise. * db2/btree/bt_recno.c: Likewise. * db2/btree/btree_auto.c: Likewise. * db2/btree/bt_rsearch.c: Likewise. * db2/btree/bt_search.c: Likewise. * db2/btree/bt_split.c: Likewise. * db2/btree/bt_stat.c: Likewise. * db2/btree/btree.src: Likewise. * db2/common/db_appinit.c: Likewise. * db2/common/db_err.c: Likewise. * db2/common/db_byteorder.c: Likewise. * db2/common/db_apprec.c: Likewise. * db2/common/db_salloc.c: Likewise. * db2/common/db_log2.c: Likewise. * db2/common/db_region.c: Likewise. * db2/common/db_shash.c: Likewise. * db2/db/db.c: Likewise. * db2/db/db.src: Likewise. * db2/db/db_conv.c: Likewise. * db2/db/db_dispatch.c: Likewise. * db2/db/db_dup.c: Likewise. * db2/db/db_overflow.c: Likewise. * db2/db/db_pr.c: Likewise. * db2/db/db_rec.c: Likewise. * db2/db/db_ret.c: Likewise. * db2/db/db_thread.c: Likewise. * db2/db/db_auto.c: Likewise. * db2/db185/db185.c: Likewise. * db2/db185/db185_int.h: Likewise. * db2/dbm/dbm.c: Likewise. * db2/hash/hash.c: Likewise. * db2/hash/hash.src: Likewise. * db2/hash/hash_page.c: Likewise. * db2/hash/hash_conv.c: Likewise. * db2/hash/hash_debug.c: Likewise. * db2/hash/hash_stat.c: Likewise. * db2/hash/hash_rec.c: Likewise. * db2/hash/hash_dup.c: Likewise. * db2/hash/hash_func.c: Likewise. * db2/hash/hash_auto.c: Likewise. * db2/include/mp.h: Likewise. * db2/include/btree.h: Likewise. * db2/include/db.h.src: Likewise. * db2/include/db_int.h.src: Likewise. * db2/include/db_shash.h: Likewise. * db2/include/db_swap.h: Likewise. * db2/include/db_185.h.src: Likewise. * db2/include/txn.h: Likewise. * db2/include/db_am.h: Likewise. * db2/include/shqueue.h: Likewise. * db2/include/hash.h: Likewise. * db2/include/db_dispatch.h: Likewise. * db2/include/lock.h: Likewise. * db2/include/db_page.h: Likewise. * db2/include/log.h: Likewise. * db2/include/db_auto.h: Likewise. * db2/include/btree_auto.h: Likewise. * db2/include/hash_auto.h: Likewise. * db2/include/log_auto.h: Likewise. * db2/include/txn_auto.h: Likewise. * db2/include/db_ext.h: Likewise. * db2/include/btree_ext.h: Likewise. * db2/include/clib_ext.h: Likewise. * db2/include/common_ext.h: Likewise. * db2/include/hash_ext.h: Likewise. * db2/include/lock_ext.h: Likewise. * db2/include/log_ext.h: Likewise. * db2/include/mp_ext.h: Likewise. * db2/include/mutex_ext.h: Likewise. * db2/include/os_ext.h: Likewise. * db2/include/txn_ext.h: Likewise. * db2/include/cxx_int.h: Likewise. * db2/include/db_cxx.h: Likewise. * db2/include/queue.h: Likewise. * db2/lock/lock.c: Likewise. * db2/lock/lock_conflict.c: Likewise. * db2/lock/lock_util.c: Likewise. * db2/lock/lock_deadlock.c: Likewise. * db2/log/log.c: Likewise. * db2/log/log_get.c: Likewise. * db2/log/log.src: Likewise. * db2/log/log_compare.c: Likewise. * db2/log/log_put.c: Likewise. * db2/log/log_rec.c: Likewise. * db2/log/log_archive.c: Likewise. * db2/log/log_register.c: Likewise. * db2/log/log_auto.c: Likewise. * db2/log/log_findckp.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_region.c: Likewise. * db2/mp/mp_pr.c: Likewise. * db2/mp/mp_sync.c: Likewise. * db2/mutex/68020.gcc: Likewise. * db2/mutex/mutex.c: Likewise. * db2/mutex/README: Likewise. * db2/mutex/x86.gcc: Likewise. * db2/mutex/sparc.gcc: Likewise. * db2/mutex/uts4.cc.s: Likewise. * db2/mutex/alpha.dec: Likewise. * db2/mutex/alpha.gcc: Likewise. * db2/mutex/parisc.gcc: Likewise. * db2/mutex/parisc.hp: Likewise. * db2/os/db_os_abs.c: Likewise. * db2/os/db_os_dir.c: Likewise. * db2/os/db_os_fid.c: Likewise. * db2/os/db_os_lseek.c: Likewise. * db2/os/db_os_mmap.c: Likewise. * db2/os/db_os_open.c: Likewise. * db2/os/db_os_rw.c: Likewise. * db2/os/db_os_sleep.c: Likewise. * db2/os/db_os_stat.c: Likewise. * db2/os/db_os_unlink.c: Likewise. * db2/txn/txn.c: Likewise. * db2/txn/txn.src: Likewise. * db2/txn/txn_rec.c: Likewise. * db2/txn/txn_auto.c: Likewise. * db2/clib/getlong.c: Likewise. * db2/progs/db_archive/db_archive.c: Likewise. * db2/progs/db_checkpoint/db_checkpoint.c: Likewise. * db2/progs/db_deadlock/db_deadlock.c: Likewise. * db2/progs/db_dump/db_dump.c: Likewise. * db2/progs/db_dump185/db_dump185.c: Likewise. * db2/progs/db_load/db_load.c: Likewise. * db2/progs/db_printlog/db_printlog.c: Likewise. * db2/progs/db_recover/db_recover.c: Likewise. * db2/progs/db_stat/db_stat.c: Likewise. * libio/stdio.h [__cplusplus] (__STDIO_INLINE): Define as inline. * po/de.po, po/sv.po: Update from 2.0.5 translations. * sysdeps/unix/sysv/linux/netinet/tcp.h: Pretty print. * sunrpc/rpc/xdr.h (XDR): Don't define argument of x_destroy callback as const. * sunrpc/xdr_mem.c (xdrmem_destroy): Don't define argument as const. * sunrpx/xdr_rec.c (xdrrec_destroy): Likewise. * sunrpx/xdr_stdio.c (xdrstdio_destroy): Likewise. 1997-08-27 18:47 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/if_index.c: Include <errno.h>. Reported by Benjamin Kosnik <bkoz@cygnus.com>. 1997-08-27 02:27 Roland McGrath <roland@baalperazim.frob.com> * abi-tags: New file. * csu/Makefile (distribute): Remove abi-tag.h. ($(objpfx)abi-tag.h): New target. * Makefile (distribute): Add abi-tags. * sysdeps/unix/sysv/linux/abi-tag.h: File removed. * sysdeps/mach/hurd/abi-tag.h: File removed. * sysdeps/stub/abi-tag.h: File removed. 1997-08-25 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/make-syscalls.sh: Change output so that it generates compilation rules only for the currently selected object suffixes. 1997-08-25 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/dl-machine.h (RTLD_START): Switch back to previous section to avoid confusing the compiler. * sysdeps/alpha/dl-machine.h (RTLD_START): Likewise. * sysdeps/i386/dl-machine.h (RTLD_START): Likewise. * sysdeps/mips/dl-machine.h (RTLD_START): Likewise. * sysdeps/mips/mips64/dl-machine.h (RTLD_START): Likewise. * sysdeps/sparc/sparc32/dl-machine.h (RTLD_START): Likewise. * sysdeps/m68k/dl-machine.h (elf_machine_load_address): Use a GOT relocation instead of a constant to avoid text relocation. (ELF_MACHINE_BEFORE_RTLD_RELOC): Removed. (RTLD_START): Declare global labels as functions and add size directive. 1997-08-25 17:01 Ulrich Drepper <drepper@cygnus.com> * sysdeps/i386/bits/select.h: Correct assembler versions to work even for descriptors >= 32. * stdlib/alloca.h: Don't define alloca to __alloca since if gcc is used __alloca is not defined to __builtin_alloca and so might not be available. Reported by Uwe Ohse <uwe@ohse.de>. * sysdeps/unix/sysv/linux/sys/sysmacros.h: Define macros in a special way if gcc is not used and so dev_t is an array. Reported by Uwe Ohse <uwe@ohse.de>. 1997-08-23 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * manual/libc.texinfo: Reorder chapters to match logical order. 1997-08-25 12:22 Ulrich Drepper <drepper@cygnus.com> * sunrpc/rpc/xdr.h: Change name of parameters in prototypes of xdr_reference, xdrmem_create, and xdrstdio_create because of clash with g++ internal symbols. Patch by Sudish Joseph <sj@eng.mindspring.net>. * elf/dl-deps.c: Implement handling of DT_FILTER.
323 lines
7.8 KiB
C
323 lines
7.8 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 copyright[] =
|
|
"@(#) Copyright (c) 1997\n\
|
|
Sleepycat Software Inc. All rights reserved.\n";
|
|
static const char sccsid[] = "@(#)db_dump185.c 10.5 (Sleepycat) 7/2/97";
|
|
#endif
|
|
|
|
#ifndef NO_SYSTEM_INCLUDES
|
|
#include <sys/types.h>
|
|
|
|
#include <ctype.h>
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <getopt.h>
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#endif
|
|
|
|
#include "db_185.h"
|
|
#include "clib_ext.h"
|
|
|
|
/* Hash Table Information */
|
|
typedef struct hashhdr { /* Disk resident portion */
|
|
int magic; /* Magic NO for hash tables */
|
|
int version; /* Version ID */
|
|
u_int32_t lorder; /* Byte Order */
|
|
int bsize; /* Bucket/Page Size */
|
|
int bshift; /* Bucket shift */
|
|
int dsize; /* Directory Size */
|
|
int ssize; /* Segment Size */
|
|
int sshift; /* Segment shift */
|
|
int ovfl_point; /* Where overflow pages are being
|
|
* allocated */
|
|
int last_freed; /* Last overflow page freed */
|
|
int max_bucket; /* ID of Maximum bucket in use */
|
|
int high_mask; /* Mask to modulo into entire table */
|
|
int low_mask; /* Mask to modulo into lower half of
|
|
* table */
|
|
int ffactor; /* Fill factor */
|
|
int nkeys; /* Number of keys in hash table */
|
|
} HASHHDR;
|
|
|
|
typedef struct htab { /* Memory resident data structure */
|
|
HASHHDR hdr; /* Header */
|
|
} HTAB;
|
|
|
|
typedef struct _epgno {
|
|
u_int32_t pgno; /* the page number */
|
|
u_int16_t index; /* the index on the page */
|
|
} EPGNO;
|
|
|
|
typedef struct _epg {
|
|
void *page; /* the (pinned) page */
|
|
u_int16_t index; /* the index on the page */
|
|
} EPG;
|
|
|
|
typedef struct _cursor {
|
|
EPGNO pg; /* B: Saved tree reference. */
|
|
DBT key; /* B: Saved key, or key.data == NULL. */
|
|
u_int32_t rcursor; /* R: recno cursor (1-based) */
|
|
|
|
#define CURS_ACQUIRE 0x01 /* B: Cursor needs to be reacquired. */
|
|
#define CURS_AFTER 0x02 /* B: Unreturned cursor after key. */
|
|
#define CURS_BEFORE 0x04 /* B: Unreturned cursor before key. */
|
|
#define CURS_INIT 0x08 /* RB: Cursor initialized. */
|
|
u_int8_t flags;
|
|
} CURSOR;
|
|
|
|
/* The in-memory btree/recno data structure. */
|
|
typedef struct _btree {
|
|
void *bt_mp; /* memory pool cookie */
|
|
|
|
void *bt_dbp; /* pointer to enclosing DB */
|
|
|
|
EPG bt_cur; /* current (pinned) page */
|
|
void *bt_pinned; /* page pinned across calls */
|
|
|
|
CURSOR bt_cursor; /* cursor */
|
|
|
|
EPGNO bt_stack[50]; /* stack of parent pages */
|
|
EPGNO *bt_sp; /* current stack pointer */
|
|
|
|
DBT bt_rkey; /* returned key */
|
|
DBT bt_rdata; /* returned data */
|
|
|
|
int bt_fd; /* tree file descriptor */
|
|
|
|
u_int32_t bt_free; /* next free page */
|
|
u_int32_t bt_psize; /* page size */
|
|
u_int16_t bt_ovflsize; /* cut-off for key/data overflow */
|
|
int bt_lorder; /* byte order */
|
|
/* sorted order */
|
|
enum { NOT, BACK, FORWARD } bt_order;
|
|
EPGNO bt_last; /* last insert */
|
|
|
|
/* B: key comparison function */
|
|
int (*bt_cmp) __P((const DBT *, const DBT *));
|
|
/* B: prefix comparison function */
|
|
size_t (*bt_pfx) __P((const DBT *, const DBT *));
|
|
/* R: recno input function */
|
|
int (*bt_irec) __P((struct _btree *, u_int32_t));
|
|
|
|
FILE *bt_rfp; /* R: record FILE pointer */
|
|
int bt_rfd; /* R: record file descriptor */
|
|
|
|
void *bt_cmap; /* R: current point in mapped space */
|
|
void *bt_smap; /* R: start of mapped space */
|
|
void *bt_emap; /* R: end of mapped space */
|
|
size_t bt_msize; /* R: size of mapped region. */
|
|
|
|
u_int32_t bt_nrecs; /* R: number of records */
|
|
size_t bt_reclen; /* R: fixed record length */
|
|
u_char bt_bval; /* R: delimiting byte/pad character */
|
|
|
|
/*
|
|
* NB:
|
|
* B_NODUPS and R_RECNO are stored on disk, and may not be changed.
|
|
*/
|
|
#define B_INMEM 0x00001 /* in-memory tree */
|
|
#define B_METADIRTY 0x00002 /* need to write metadata */
|
|
#define B_MODIFIED 0x00004 /* tree modified */
|
|
#define B_NEEDSWAP 0x00008 /* if byte order requires swapping */
|
|
#define B_RDONLY 0x00010 /* read-only tree */
|
|
|
|
#define B_NODUPS 0x00020 /* no duplicate keys permitted */
|
|
#define R_RECNO 0x00080 /* record oriented tree */
|
|
|
|
#define R_CLOSEFP 0x00040 /* opened a file pointer */
|
|
#define R_EOF 0x00100 /* end of input file reached. */
|
|
#define R_FIXLEN 0x00200 /* fixed length records */
|
|
#define R_MEMMAPPED 0x00400 /* memory mapped file. */
|
|
#define R_INMEM 0x00800 /* in-memory file */
|
|
#define R_MODIFIED 0x01000 /* modified file */
|
|
#define R_RDONLY 0x02000 /* read-only file */
|
|
|
|
#define B_DB_LOCK 0x04000 /* DB_LOCK specified. */
|
|
#define B_DB_SHMEM 0x08000 /* DB_SHMEM specified. */
|
|
#define B_DB_TXN 0x10000 /* DB_TXN specified. */
|
|
u_int32_t flags;
|
|
} BTREE;
|
|
|
|
void db_185_btree __P((DB *, int));
|
|
void db_185_hash __P((DB *, int));
|
|
void dbt_dump __P((DBT *));
|
|
void dbt_print __P((DBT *));
|
|
void usage __P((void));
|
|
int main __P((int, char *[]));
|
|
|
|
const char *progname = "db_dump185"; /* Program name. */
|
|
|
|
int
|
|
main(argc, argv)
|
|
int argc;
|
|
char *argv[];
|
|
{
|
|
extern char *optarg;
|
|
extern int optind;
|
|
DB *dbp;
|
|
DBT key, data;
|
|
int ch, pflag, rval;
|
|
|
|
pflag = 0;
|
|
while ((ch = getopt(argc, argv, "f:p")) != EOF)
|
|
switch (ch) {
|
|
case 'f':
|
|
if (freopen(optarg, "w", stdout) == NULL)
|
|
err(1, "%s", optarg);
|
|
break;
|
|
case 'p':
|
|
pflag = 1;
|
|
break;
|
|
case '?':
|
|
default:
|
|
usage();
|
|
}
|
|
argc -= optind;
|
|
argv += optind;
|
|
|
|
if (argc != 1)
|
|
usage();
|
|
|
|
if ((dbp = dbopen(argv[0], O_RDONLY, 0, DB_BTREE, NULL)) == NULL) {
|
|
if ((dbp = dbopen(argv[0], O_RDONLY, 0, DB_HASH, NULL)) == NULL)
|
|
return (1);
|
|
db_185_hash(dbp, pflag);
|
|
} else
|
|
db_185_btree(dbp, pflag);
|
|
|
|
/*
|
|
* !!!
|
|
* DB 1.85 DBTs are a subset of DB 2.0 DBTs, so we just use the
|
|
* new dump/print routines.
|
|
*/
|
|
if (pflag)
|
|
while (!(rval = dbp->seq(dbp, &key, &data, R_NEXT))) {
|
|
dbt_print(&key);
|
|
dbt_print(&data);
|
|
}
|
|
else
|
|
while (!(rval = dbp->seq(dbp, &key, &data, R_NEXT))) {
|
|
dbt_dump(&key);
|
|
dbt_dump(&data);
|
|
}
|
|
|
|
if (rval == -1)
|
|
err(1, "seq");
|
|
return (0);
|
|
}
|
|
|
|
/*
|
|
* db_185_hash --
|
|
* Dump out hash header information.
|
|
*/
|
|
void
|
|
db_185_hash(dbp, pflag)
|
|
DB *dbp;
|
|
int pflag;
|
|
{
|
|
HTAB *hashp;
|
|
|
|
hashp = dbp->internal;
|
|
|
|
printf("format=%s\n", pflag ? "print" : "bytevalue");
|
|
printf("type=hash\n");
|
|
printf("h_ffactor=%lu\n", (u_long)hashp->hdr.ffactor);
|
|
#ifdef NOT_AVAILABLE_IN_DB_185
|
|
printf("h_nelem=%lu\n", (u_long)hashp->hdr.nelem);
|
|
#endif
|
|
if (hashp->hdr.lorder != 0)
|
|
printf("db_lorder=%lu\n", (u_long)hashp->hdr.lorder);
|
|
printf("db_pagesize=%lu\n", (u_long)hashp->hdr.bsize);
|
|
printf("HEADER=END\n");
|
|
}
|
|
|
|
/*
|
|
* db_185_btree --
|
|
* Dump out btree header information.
|
|
*/
|
|
void
|
|
db_185_btree(dbp, pflag)
|
|
DB *dbp;
|
|
int pflag;
|
|
{
|
|
BTREE *btp;
|
|
|
|
btp = dbp->internal;
|
|
|
|
printf("format=%s\n", pflag ? "print" : "bytevalue");
|
|
printf("type=btree\n");
|
|
#ifdef NOT_AVAILABLE_IN_185
|
|
printf("bt_minkey=%lu\n", (u_long)XXX);
|
|
printf("bt_maxkey=%lu\n", (u_long)XXX);
|
|
#endif
|
|
if (btp->bt_lorder != 0)
|
|
printf("db_lorder=%lu\n", (u_long)btp->bt_lorder);
|
|
printf("db_pagesize=%lu\n", (u_long)btp->bt_psize);
|
|
if (!(btp->flags & B_NODUPS))
|
|
printf("duplicates=1\n");
|
|
printf("HEADER=END\n");
|
|
}
|
|
|
|
static char hex[] = "0123456789abcdef";
|
|
|
|
/*
|
|
* dbt_dump --
|
|
* Write out a key or data item using byte values.
|
|
*/
|
|
void
|
|
dbt_dump(dbtp)
|
|
DBT *dbtp;
|
|
{
|
|
size_t len;
|
|
u_int8_t *p;
|
|
|
|
for (len = dbtp->size, p = dbtp->data; len--; ++p)
|
|
(void)printf("%c%c",
|
|
hex[(*p & 0xf0) >> 4], hex[*p & 0x0f]);
|
|
printf("\n");
|
|
}
|
|
|
|
/*
|
|
* dbt_print --
|
|
* Write out a key or data item using printable characters.
|
|
*/
|
|
void
|
|
dbt_print(dbtp)
|
|
DBT *dbtp;
|
|
{
|
|
size_t len;
|
|
u_int8_t *p;
|
|
|
|
for (len = dbtp->size, p = dbtp->data; len--; ++p)
|
|
if (isprint(*p)) {
|
|
if (*p == '\\')
|
|
(void)printf("\\");
|
|
(void)printf("%c", *p);
|
|
} else
|
|
(void)printf("\\%c%c",
|
|
hex[(*p & 0xf0) >> 4], hex[*p & 0x0f]);
|
|
printf("\n");
|
|
}
|
|
|
|
/*
|
|
* usage --
|
|
* Display the usage message.
|
|
*/
|
|
void
|
|
usage()
|
|
{
|
|
(void)fprintf(stderr, "usage: db_dump [-p] [-f file] db_file\n");
|
|
exit(1);
|
|
}
|