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.
459 lines
9.6 KiB
C
459 lines
9.6 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_load.c 10.12 (Sleepycat) 8/28/97";
|
|
#endif
|
|
|
|
#ifndef NO_SYSTEM_INCLUDES
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
|
|
#include <errno.h>
|
|
#include <limits.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#endif
|
|
|
|
#include "db_int.h"
|
|
#include "clib_ext.h"
|
|
|
|
void badnum __P((void));
|
|
void configure __P((DB_INFO *, char **));
|
|
DB_ENV *db_init __P((char *));
|
|
int dbt_rdump __P((DBT *));
|
|
int dbt_rprint __P((DBT *));
|
|
int digitize __P((int));
|
|
int main __P((int, char *[]));
|
|
void rheader __P((DBTYPE *, int *, DB_INFO *));
|
|
void usage __P((void));
|
|
|
|
const char
|
|
*progname = "db_load"; /* Program name. */
|
|
|
|
int
|
|
main(argc, argv)
|
|
int argc;
|
|
char *argv[];
|
|
{
|
|
extern char *optarg;
|
|
extern int optind;
|
|
DB *dbp;
|
|
DBT key, data;
|
|
DBTYPE argtype, headertype;
|
|
DB_ENV *dbenv;
|
|
DB_INFO dbinfo;
|
|
db_recno_t recno;
|
|
int ch, pflag;
|
|
char **clist, **clp, *home;
|
|
|
|
/* Allocate enough room for configuration arguments. */
|
|
if ((clp = clist = calloc(argc + 1, sizeof(char *))) == NULL)
|
|
err(1, NULL);
|
|
|
|
home = NULL;
|
|
argtype = DB_UNKNOWN;
|
|
while ((ch = getopt(argc, argv, "c:f:h:t:")) != EOF)
|
|
switch (ch) {
|
|
case 'c':
|
|
*clp++ = optarg;
|
|
break;
|
|
case 'f':
|
|
if (freopen(optarg, "r", stdin) == NULL)
|
|
err(1, "%s", optarg);
|
|
break;
|
|
case 'h':
|
|
home = optarg;
|
|
break;
|
|
case 't':
|
|
if (strcmp(optarg, "btree") == 0) {
|
|
argtype = DB_BTREE;
|
|
break;
|
|
}
|
|
if (strcmp(optarg, "hash") == 0) {
|
|
argtype = DB_HASH;
|
|
break;
|
|
}
|
|
usage();
|
|
/* NOTREACHED */
|
|
case '?':
|
|
default:
|
|
usage();
|
|
}
|
|
argc -= optind;
|
|
argv += optind;
|
|
|
|
if (argc != 1)
|
|
usage();
|
|
|
|
/* Initialize the environment. */
|
|
dbenv = db_init(home);
|
|
memset(&dbinfo, 0, sizeof(DB_INFO));
|
|
|
|
/* Read the header. */
|
|
rheader(&headertype, &pflag, &dbinfo);
|
|
|
|
/* Apply command-line configuration changes. */
|
|
configure(&dbinfo, clist);
|
|
|
|
/* Conversion to/from recno is prohibited. */
|
|
if (argtype != DB_UNKNOWN) {
|
|
if (headertype == DB_RECNO)
|
|
errx(1, "databases of type recno may not be converted");
|
|
headertype = argtype;
|
|
}
|
|
|
|
/* Open the DB file. */
|
|
if ((errno = db_open(argv[0], headertype, DB_CREATE | DB_TRUNCATE,
|
|
S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH,
|
|
dbenv, &dbinfo, &dbp)) != 0)
|
|
err(1, "%s", argv[0]);
|
|
|
|
/* Initialize the key/data pair. */
|
|
memset(&key, 0, sizeof(DBT));
|
|
if ((key.data = (void *)malloc(key.ulen = 1024)) == NULL) {
|
|
errno = ENOMEM;
|
|
err(1, NULL);
|
|
}
|
|
memset(&data, 0, sizeof(DBT));
|
|
if ((data.data = (void *)malloc(data.ulen = 1024)) == NULL) {
|
|
errno = ENOMEM;
|
|
err(1, NULL);
|
|
}
|
|
|
|
/* Get each key/data pair and add them to the database. */
|
|
if (headertype == DB_RECNO) {
|
|
key.data = &recno;
|
|
key.size = sizeof(recno);
|
|
for (recno = 1;; ++recno) {
|
|
if (pflag) {
|
|
if (dbt_rprint(&data))
|
|
break;
|
|
} else
|
|
if (dbt_rdump(&data))
|
|
break;
|
|
if ((errno = dbp->put(dbp, NULL, &key, &data, 0)) != 0)
|
|
err(1, "%s", argv[0]);
|
|
}
|
|
} else
|
|
for (;;) {
|
|
if (pflag) {
|
|
if (dbt_rprint(&key))
|
|
break;
|
|
if (dbt_rprint(&data))
|
|
goto fmt;
|
|
} else {
|
|
if (dbt_rdump(&key))
|
|
break;
|
|
if (dbt_rdump(&data))
|
|
fmt: err(1, "odd number of key/data pairs");
|
|
}
|
|
if ((errno = dbp->put(dbp, NULL, &key, &data, 0)) != 0)
|
|
err(1, "%s", argv[0]);
|
|
}
|
|
|
|
if ((errno = dbp->close(dbp, 0)) != 0)
|
|
err(1, "%s", argv[0]);
|
|
return (0);
|
|
}
|
|
|
|
/*
|
|
* db_init --
|
|
* Initialize the environment.
|
|
*/
|
|
DB_ENV *
|
|
db_init(home)
|
|
char *home;
|
|
{
|
|
DB_ENV *dbenv;
|
|
|
|
if ((dbenv = (DB_ENV *)calloc(sizeof(DB_ENV), 1)) == NULL) {
|
|
errno = ENOMEM;
|
|
err(1, NULL);
|
|
}
|
|
dbenv->db_errfile = stderr;
|
|
dbenv->db_errpfx = progname;
|
|
|
|
if ((errno =
|
|
db_appinit(home, NULL, dbenv, DB_CREATE | DB_USE_ENVIRON)) != 0)
|
|
err(1, "db_appinit");
|
|
return (dbenv);
|
|
}
|
|
|
|
#define FLAG(name, value, keyword, flag) \
|
|
if (strcmp(name, keyword) == 0) { \
|
|
switch (*value) { \
|
|
case '1': \
|
|
dbinfop->flags |= (flag); \
|
|
break; \
|
|
case '0': \
|
|
dbinfop->flags &= ~(flag); \
|
|
break; \
|
|
default: \
|
|
badnum(); \
|
|
/* NOTREACHED */ \
|
|
} \
|
|
continue; \
|
|
}
|
|
#define NUMBER(name, value, keyword, field, flag) \
|
|
if (strcmp(name, keyword) == 0) { \
|
|
get_long(value, 1, LONG_MAX, &val); \
|
|
dbinfop->field = val; \
|
|
if (flag != 0) \
|
|
dbinfop->flags |= (flag); \
|
|
continue; \
|
|
}
|
|
#define STRING(name, value, keyword, field, flag) \
|
|
if (strcmp(name, keyword) == 0) { \
|
|
dbinfop->field = value[0]; \
|
|
if (flag != 0) \
|
|
dbinfop->flags |= (flag); \
|
|
continue; \
|
|
}
|
|
|
|
/*
|
|
* configure --
|
|
* Handle command-line configuration options.
|
|
*/
|
|
void
|
|
configure(dbinfop, clp)
|
|
DB_INFO *dbinfop;
|
|
char **clp;
|
|
{
|
|
long val;
|
|
char *name, *value;
|
|
|
|
for (; (name = *clp) != NULL; ++clp) {
|
|
if ((value = strchr(name, '=')) == NULL)
|
|
errx(1,
|
|
"command-line configuration uses name=value format");
|
|
*value++ = '\0';
|
|
|
|
NUMBER(name, value, "bt_maxkey", bt_maxkey, 0);
|
|
NUMBER(name, value, "bt_minkey", bt_minkey, 0);
|
|
NUMBER(name, value, "db_lorder", db_lorder, 0);
|
|
NUMBER(name, value, "db_pagesize", db_pagesize, 0);
|
|
FLAG(name, value, "duplicates", DB_DUP);
|
|
NUMBER(name, value, "h_ffactor", h_ffactor, 0);
|
|
NUMBER(name, value, "h_nelem", h_nelem, 0);
|
|
NUMBER(name, value, "re_len", re_len, DB_FIXEDLEN);
|
|
STRING(name, value, "re_pad", re_pad, DB_PAD);
|
|
FLAG(name, value, "recnum", DB_RECNUM);
|
|
FLAG(name, value, "renumber", DB_RENUMBER);
|
|
|
|
errx(1, "unknown command-line configuration keyword");
|
|
}
|
|
}
|
|
|
|
/*
|
|
* rheader --
|
|
* Read the header message.
|
|
*/
|
|
void
|
|
rheader(dbtypep, pflagp, dbinfop)
|
|
DBTYPE *dbtypep;
|
|
int *pflagp;
|
|
DB_INFO *dbinfop;
|
|
{
|
|
long lineno, val;
|
|
char name[256], value[256];
|
|
|
|
*dbtypep = DB_UNKNOWN;
|
|
*pflagp = 0;
|
|
|
|
for (lineno = 1;; ++lineno) {
|
|
if (fscanf(stdin, "%[^=]=%s\n", name, value) != 2)
|
|
errx(1, "line %lu: unexpected format", lineno);
|
|
if (strcmp(name, "HEADER") == 0)
|
|
break;
|
|
|
|
if (strcmp(name, "format") == 0) {
|
|
if (strcmp(value, "bytevalue") == 0) {
|
|
*pflagp = 0;
|
|
continue;
|
|
}
|
|
if (strcmp(value, "print") == 0) {
|
|
*pflagp = 1;
|
|
continue;
|
|
}
|
|
errx(1, "line %d: unknown format", lineno);
|
|
}
|
|
if (strcmp(name, "type") == 0) {
|
|
if (strcmp(value, "btree") == 0) {
|
|
*dbtypep = DB_BTREE;
|
|
continue;
|
|
}
|
|
if (strcmp(value, "hash") == 0) {
|
|
*dbtypep = DB_HASH;
|
|
continue;
|
|
}
|
|
if (strcmp(value, "recno") == 0) {
|
|
*dbtypep = DB_RECNO;
|
|
continue;
|
|
}
|
|
errx(1, "line %d: unknown type", lineno);
|
|
}
|
|
NUMBER(name, value, "bt_maxkey", bt_maxkey, 0);
|
|
NUMBER(name, value, "bt_minkey", bt_minkey, 0);
|
|
NUMBER(name, value, "db_lorder", db_lorder, 0);
|
|
NUMBER(name, value, "db_pagesize", db_pagesize, 0);
|
|
FLAG(name, value, "duplicates", DB_DUP);
|
|
NUMBER(name, value, "h_ffactor", h_ffactor, 0);
|
|
NUMBER(name, value, "h_nelem", h_nelem, 0);
|
|
NUMBER(name, value, "re_len", re_len, DB_FIXEDLEN);
|
|
STRING(name, value, "re_pad", re_pad, DB_PAD);
|
|
FLAG(name, value, "recnum", DB_RECNUM);
|
|
FLAG(name, value, "renumber", DB_RENUMBER);
|
|
|
|
errx(1, "unknown input-file header configuration keyword");
|
|
}
|
|
}
|
|
|
|
/*
|
|
* dbt_rprint --
|
|
* Read a printable line into a DBT structure.
|
|
*/
|
|
int
|
|
dbt_rprint(dbtp)
|
|
DBT *dbtp;
|
|
{
|
|
u_int32_t len;
|
|
u_int8_t *p;
|
|
int c1, c2, escape;
|
|
|
|
escape = 0;
|
|
for (p = dbtp->data, len = 0; (c1 = getchar()) != '\n';) {
|
|
if (c1 == EOF) {
|
|
if (len == 0)
|
|
return (1);
|
|
err(1, "unexpected end of key/data pair");
|
|
}
|
|
if (escape) {
|
|
if (c1 != '\\') {
|
|
if ((c2 = getchar()) == EOF)
|
|
err(1,
|
|
"unexpected end of key/data pair");
|
|
c1 = digitize(c1) << 4 | digitize(c2);
|
|
}
|
|
escape = 0;
|
|
} else
|
|
if (c1 == '\\') {
|
|
escape = 1;
|
|
continue;
|
|
}
|
|
if (++len >= dbtp->ulen - 10) {
|
|
dbtp->ulen *= 2;
|
|
if ((dbtp->data =
|
|
(void *)realloc(dbtp->data, dbtp->ulen)) == NULL) {
|
|
errno = ENOMEM;
|
|
err(1, NULL);
|
|
}
|
|
p = (u_int8_t *)dbtp->data + len;
|
|
}
|
|
*p++ = c1;
|
|
}
|
|
dbtp->size = len;
|
|
return (0);
|
|
}
|
|
|
|
/*
|
|
* digitize --
|
|
* Convert a character to an integer.
|
|
*/
|
|
int
|
|
digitize(c)
|
|
int c;
|
|
{
|
|
switch (c) { /* Don't depend on ASCII ordering. */
|
|
case '0': return (0);
|
|
case '1': return (1);
|
|
case '2': return (2);
|
|
case '3': return (3);
|
|
case '4': return (4);
|
|
case '5': return (5);
|
|
case '6': return (6);
|
|
case '7': return (7);
|
|
case '8': return (8);
|
|
case '9': return (9);
|
|
case 'a': return (10);
|
|
case 'b': return (11);
|
|
case 'c': return (12);
|
|
case 'd': return (13);
|
|
case 'e': return (14);
|
|
case 'f': return (15);
|
|
}
|
|
|
|
err(1, "unexpected hexadecimal value");
|
|
/* NOTREACHED */
|
|
|
|
return (0);
|
|
}
|
|
|
|
/*
|
|
* dbt_rdump --
|
|
* Read a byte dump line into a DBT structure.
|
|
*/
|
|
int
|
|
dbt_rdump(dbtp)
|
|
DBT *dbtp;
|
|
{
|
|
u_int32_t len;
|
|
u_int8_t *p;
|
|
int c1, c2;
|
|
|
|
for (p = dbtp->data, len = 0; (c1 = getchar()) != '\n';) {
|
|
if (c1 == EOF) {
|
|
if (len == 0)
|
|
return (1);
|
|
err(1, "unexpected end of key/data pair");
|
|
}
|
|
if ((c2 = getchar()) == EOF)
|
|
err(1, "unexpected end of key/data pair");
|
|
if (++len >= dbtp->ulen - 10) {
|
|
dbtp->ulen *= 2;
|
|
if ((dbtp->data =
|
|
(void *)realloc(dbtp->data, dbtp->ulen)) == NULL) {
|
|
errno = ENOMEM;
|
|
err(1, NULL);
|
|
}
|
|
p = (u_int8_t *)dbtp->data + len;
|
|
}
|
|
*p++ = digitize(c1) << 4 | digitize(c2);
|
|
}
|
|
dbtp->size = len;
|
|
return (0);
|
|
}
|
|
|
|
/*
|
|
* badnum --
|
|
* Display the bad number message.
|
|
*/
|
|
void
|
|
badnum()
|
|
{
|
|
err(1, "boolean name=value pairs require a value of 0 or 1");
|
|
}
|
|
|
|
/*
|
|
* usage --
|
|
* Display the usage message.
|
|
*/
|
|
void
|
|
usage()
|
|
{
|
|
(void)fprintf(stderr,
|
|
"usage: db_load [-c name=value] [-f file] [-h home] [-t btree | hash] db_file\n");
|
|
exit(1);
|
|
}
|