af69217fea
1998-01-26 00:57 Ulrich Drepper <drepper@cygnus.com> * db2/Makefile (routines): Add os_alloc. * db2/db.h: Update from db-2.3.16. * db2/db_185.h: Likewise. * db2/db_int.h: Likewise. * db2/btree/bt_close.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/common/db_appinit.c: Likewise. * db2/common/db_apprec.c: Likewise. * db2/common/db_err.c: Likewise. * db2/common/db_region.c: Likewise. * db2/common/db_shash.c: Likewise. * db2/db/db.c: Likewise. * db2/db/db_auto.c: Likewise. * db2/db/db_conv.c: Likewise. * db2/db/db_dispatch.c: Likewise. * db2/db/db_dup.c: Likewise. * db2/db/db_pr.c: Likewise. * db2/db/db_rec.c: Likewise. * db2/db185/db185.c: Likewise. * db2/dbm/dbm.c: Likewise. * db2/hash/hash.c: Likewise. * db2/hash/hash_auto.c: Likewise. * db2/hash/hash_dup.c: Likewise. * db2/hash/hash_page.c: Likewise. * db2/hash/hash_rec.c: Likewise. * db2/include/btree_ext.h: Likewise. * db2/include/clib_ext.h: Likewise. * db2/include/common_ext.h: Likewise. * db2/include/db.h.src: Likewise. * db2/include/db_185.h.src: Likewise. * db2/include/db_am.h: Likewise. * db2/include/db_ext.h: Likewise. * db2/include/db_int.h.src: Likewise. * db2/include/hash_ext.h: Likewise. * db2/include/lock_ext.h: Likewise. * db2/include/log.h: Likewise. * db2/include/log_auto.h: Likewise. * db2/include/log_ext.h: Likewise. * db2/include/mp.h: Likewise. * db2/include/mp_ext.h: Likewise. * db2/include/mutex_ext.h: Likewise. * db2/include/os_ext.h: Likewise. * db2/include/os_func.h: Likewise. * db2/include/txn_ext.h: Likewise. * db2/lock/lock.c: Likewise. * db2/lock/lock_util.c: Likewise. * db2/log/log.c: Likewise. * db2/log/log.src: 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_rec.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_pr.c: Likewise. * db2/mp/mp_sync.c: Likewise. * db2/mutex/mutex.c: Likewise. * db2/os/os_alloc.c: Likewise. * db2/os/os_config.c: Likewise. * db2/os/os_stat.c: Likewise. * db2/progs/db_checkpoint/db_checkpoint.c: Likewise. * db2/progs/db_deadlock/db_deadlock.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. * db2/txn/txn.c: Likewise. * elf/dl-close.c (_dl_close): Rename inner variable named map to imap. Unmap memory blocks in reverse order of allocation. Call munmap with load address added to offset. Bug reported by Miguel de Icaza. * locale/programs/ld-collate.c (collate_end_weight): Correctly fill up weight array. * localedata/locales/cs_CZ: Update by Michael Mraka <michael@informatics.muni.cz>. * misc/sys/syslog.h: Reformat a bit. Don't declare vsyslog unless __USE_BSD. * nis/nss_compat/compat-grp.c: Correctly handle buffer overflow while reading line with fgets. * nis/nss_compat/compat-pwd.c: Likewise. * nis/nss_compat/compat-spwd.c: Likewise. * nss/nss_files/files-XXX.c: Likewise. * nss/nss_files/files-alias.c: Likewise. * shadow/fgetspent_r.c: Likewise. * string/strerror_r.c: Correct comment. Patch by Andreas Jaeger. * sysdeps/unix/sysv/linux/bits/stat.h: Define _STATBUF_ST_RDEV. * sysdeps/unix/sysv/linux/alpha/bits/stat.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/stat.h: Likewise. * sysdeps/unix/sysv/linux/i386/sys/ucontext.h: Allocate room for FP register content in ucontext_t. 1998-01-22 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/libm-ieee754/s_modfl.c (modf): Correct calculation. Patch by Markus Schoder <Markus.Schoder@dresdner-bank.de>. * math/libm-test.c (modf_test): Add more tests for modf. * sysdeps/unix/sysv/linux/sys/mman.h: Add const to mlock and munlock according to Unix98. 1998-01-25 Andreas Jaeger <aj@arthur.rhein-neckar.de> * nss/nss_files/files-network.c (LINE_PARSER): Set n_addrtype to AF_INET. 1998-01-21 07:22 H.J. Lu <hjl@gnu.org> * sysdeps/posix/ttyname.c: Handle symbolic links. * sysdeps/posix/ttyname_r.c: Ditto. 1998-01-25 19:39 Ulrich Drepper <drepper@cygnus.com> * db2/makedb.c (process_input): Write terminating \0 for value. (print_database): Simply print value string, don't use length. 1998-01-24 Andreas Jaeger <aj@arthur.rhein-neckar.de> * nss/nsswitch.c (__nss_configure_lookup): Correct test for early exit of loop. 1998-01-25 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/ypclnt.c: Don't set dom_client to NULL, or we will not close all sockets. 1998-01-25 14:54 Ulrich Drepper <drepper@cygnus.com> * signal/Makefile (routines): Add sighold, sigrelse, sigignore, and sigset. * signal/sighold.c: New file. * signal/sigrelse.c: New file. * sysdeps/generic/sigignore.c: New file. * sysdeps/generic/sigset.c: New file. * sysdeps/posix/sigignore.c: New file. * sysdeps/posix/sigset.c: New file. * signal/signal.h: Add prototypes for new functions. * sysdeps/unix/sysv/linux/alpha/bits/signum.h: Define SIG_HOLD. * sysdeps/unix/sysv/linux/bits/signum.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/signum.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/signum.h: Likewise. 1998-01-23 00:16 Tim Waugh <tim@cyberelk.demon.co.uk> * posix/wordexp.c: Added IFS field-splitting in parameter and command substitution. Fixed an IFS-related bug that caused an infinite loop. 1998-01-25 12:38 Ulrich Drepper <drepper@cygnus.com> * stdlib/Makefile (routines): Add getcontext, setcontext, makecontext, and swapcontext. * stdlib/ucontext.h: Correct prototypes. * sysdeps/generic/getcontext.c: New file. * sysdeps/generic/setcontext.c: New file. * sysdeps/generic/makecontext.c: New file. * sysdeps/generic/swapcontext.c: New file. * sysdeps/unix/sysv/linux/sparc/sparc64/Makefile: Removed. 1998-01-25 04:07 Ulrich Drepper <drepper@cygnus.com> * resource/sys/resource.h: Remove #include of ulimit.h which is not allowed by SUSv2 and not available on other systems. * sysdeps/unix/sysv/linux/ulimit.c: Include ulimit.h. * streams/Makefile: New file. * streams/stropts.h: New file. * sysdeps/generic/bits/stropts.h: New file. * sysdeps/generic/isastream.c: New file. * sysdeps/generic/getmsg.c: New file. * sysdeps/generic/getpmsg.c: New file. * sysdeps/generic/putmsg.c: New file. * sysdeps/generic/putpmsg.c: New file. * sysdeps/generic/fattach.c: New file. * sysdeps/generic/fdetach.c: New file. * sysdeps/unix/inet/Subdirs: Add streams. * sysdeps/generic/bits/types.h: Add definition of __t_scalar_t and __t_uscalar_t. * sysdeps/unix/sysv/linux/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h: Likewise. * sysdeps/mach/_strerror.c: Follow changes of generic version to handle small buffers correctly. 1998-01-24 17:31 H.J. Lu <hjl@gnu.org> * sysdeps/alpha/dl-machine.h (ELF_MACHINE_RUNTIME_TRAMPOLINE): Remove the 3rd arg and add declaration for _dl_runtime_resolve and _dl_runtime_profile. 1998-01-25 02:42 Ulrich Drepper <drepper@cygnus.com> * include/cpio.h: New file. Mainly copied from GNU cpio. * posix/Makefile (headers): Add cpio.h.
414 lines
9.0 KiB
C
414 lines
9.0 KiB
C
/*-
|
|
* See the file LICENSE for redistribution information.
|
|
*
|
|
* Copyright (c) 1997
|
|
* Sleepycat Software. All rights reserved.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#ifndef lint
|
|
static const char sccsid[] = "@(#)log_archive.c 10.30 (Sleepycat) 1/8/98";
|
|
#endif /* not lint */
|
|
|
|
#ifndef NO_SYSTEM_INCLUDES
|
|
#include <sys/types.h>
|
|
|
|
#include <errno.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#endif
|
|
|
|
#include "db_int.h"
|
|
#include "db_dispatch.h"
|
|
#include "shqueue.h"
|
|
#include "log.h"
|
|
#include "clib_ext.h"
|
|
#include "common_ext.h"
|
|
|
|
static int __absname __P((char *, char *, char **));
|
|
static int __build_data __P((DB_LOG *, char *, char ***, void *(*)(size_t)));
|
|
static int __cmpfunc __P((const void *, const void *));
|
|
static int __usermem __P((char ***, void *(*)(size_t)));
|
|
|
|
/*
|
|
* log_archive --
|
|
* Supporting function for db_archive(1).
|
|
*/
|
|
int
|
|
log_archive(dblp, listp, flags, db_malloc)
|
|
DB_LOG *dblp;
|
|
char ***listp;
|
|
int flags;
|
|
void *(*db_malloc) __P((size_t));
|
|
{
|
|
DBT rec;
|
|
DB_LSN stable_lsn;
|
|
u_int32_t fnum;
|
|
int array_size, n, ret;
|
|
char **array, **arrayp, *name, *p, *pref, buf[MAXPATHLEN];
|
|
|
|
COMPQUIET(fnum, 0);
|
|
|
|
#define OKFLAGS (DB_ARCH_ABS | DB_ARCH_DATA | DB_ARCH_LOG)
|
|
if (flags != 0) {
|
|
if ((ret =
|
|
__db_fchk(dblp->dbenv, "log_archive", flags, OKFLAGS)) != 0)
|
|
return (ret);
|
|
if ((ret =
|
|
__db_fcchk(dblp->dbenv,
|
|
"log_archive", flags, DB_ARCH_DATA, DB_ARCH_LOG)) != 0)
|
|
return (ret);
|
|
}
|
|
|
|
/*
|
|
* Get the absolute pathname of the current directory. It would
|
|
* be nice to get the shortest pathname of the database directory,
|
|
* but that's just not possible.
|
|
*/
|
|
if (LF_ISSET(DB_ARCH_ABS)) {
|
|
errno = 0;
|
|
if ((pref = getcwd(buf, sizeof(buf))) == NULL)
|
|
return (errno == 0 ? ENOMEM : errno);
|
|
} else
|
|
pref = NULL;
|
|
|
|
switch (LF_ISSET(~DB_ARCH_ABS)) {
|
|
case DB_ARCH_DATA:
|
|
return (__build_data(dblp, pref, listp, db_malloc));
|
|
case DB_ARCH_LOG:
|
|
memset(&rec, 0, sizeof(rec));
|
|
if (F_ISSET(dblp, DB_AM_THREAD))
|
|
F_SET(&rec, DB_DBT_MALLOC);
|
|
if ((ret = log_get(dblp, &stable_lsn, &rec, DB_LAST)) != 0)
|
|
return (ret);
|
|
if (F_ISSET(dblp, DB_AM_THREAD))
|
|
__db_free(rec.data);
|
|
fnum = stable_lsn.file;
|
|
break;
|
|
case 0:
|
|
if ((ret = __log_findckp(dblp, &stable_lsn)) != 0) {
|
|
if (ret != DB_NOTFOUND)
|
|
return (ret);
|
|
*listp = NULL;
|
|
return (0);
|
|
}
|
|
/* Remove any log files before the last stable LSN. */
|
|
fnum = stable_lsn.file - 1;
|
|
break;
|
|
}
|
|
|
|
#define LIST_INCREMENT 64
|
|
/* Get some initial space. */
|
|
if ((array =
|
|
(char **)__db_malloc(sizeof(char *) * (array_size = 10))) == NULL)
|
|
return (ENOMEM);
|
|
array[0] = NULL;
|
|
|
|
/* Build an array of the file names. */
|
|
for (n = 0; fnum > 0; --fnum) {
|
|
if ((ret = __log_name(dblp, fnum, &name)) != 0)
|
|
goto err;
|
|
if (__db_exists(name, NULL) != 0)
|
|
break;
|
|
|
|
if (n >= array_size - 1) {
|
|
array_size += LIST_INCREMENT;
|
|
if ((array = (char **)__db_realloc(array,
|
|
sizeof(char *) * array_size)) == NULL) {
|
|
ret = ENOMEM;
|
|
goto err;
|
|
}
|
|
}
|
|
|
|
if (LF_ISSET(DB_ARCH_ABS)) {
|
|
if ((ret = __absname(pref, name, &array[n])) != 0)
|
|
goto err;
|
|
FREES(name);
|
|
} else if ((p = __db_rpath(name)) != NULL) {
|
|
if ((array[n] = (char *)__db_strdup(p + 1)) == NULL) {
|
|
ret = ENOMEM;
|
|
goto err;
|
|
}
|
|
FREES(name);
|
|
} else
|
|
array[n] = name;
|
|
|
|
array[++n] = NULL;
|
|
}
|
|
|
|
/* If there's nothing to return, we're done. */
|
|
if (n == 0) {
|
|
*listp = NULL;
|
|
ret = 0;
|
|
goto err;
|
|
}
|
|
|
|
/* Sort the list. */
|
|
qsort(array, (size_t)n, sizeof(char *), __cmpfunc);
|
|
|
|
/* Rework the memory. */
|
|
if ((ret = __usermem(&array, db_malloc)) != 0)
|
|
goto err;
|
|
|
|
*listp = array;
|
|
return (0);
|
|
|
|
err: if (array != NULL) {
|
|
for (arrayp = array; *arrayp != NULL; ++arrayp)
|
|
FREES(*arrayp);
|
|
__db_free(array);
|
|
}
|
|
return (ret);
|
|
}
|
|
|
|
/*
|
|
* __build_data --
|
|
* Build a list of datafiles for return.
|
|
*/
|
|
static int
|
|
__build_data(dblp, pref, listp, db_malloc)
|
|
DB_LOG *dblp;
|
|
char *pref, ***listp;
|
|
void *(*db_malloc) __P((size_t));
|
|
{
|
|
DBT rec;
|
|
DB_LSN lsn;
|
|
__log_register_args *argp;
|
|
u_int32_t rectype;
|
|
int array_size, last, n, nxt, ret;
|
|
char **array, **arrayp, *p, *real_name;
|
|
|
|
/* Get some initial space. */
|
|
if ((array =
|
|
(char **)__db_malloc(sizeof(char *) * (array_size = 10))) == NULL)
|
|
return (ENOMEM);
|
|
array[0] = NULL;
|
|
|
|
memset(&rec, 0, sizeof(rec));
|
|
if (F_ISSET(dblp, DB_AM_THREAD))
|
|
F_SET(&rec, DB_DBT_MALLOC);
|
|
for (n = 0, ret = log_get(dblp, &lsn, &rec, DB_FIRST);
|
|
ret == 0; ret = log_get(dblp, &lsn, &rec, DB_NEXT)) {
|
|
if (rec.size < sizeof(rectype)) {
|
|
ret = EINVAL;
|
|
__db_err(dblp->dbenv, "log_archive: bad log record");
|
|
goto lg_free;
|
|
}
|
|
|
|
memcpy(&rectype, rec.data, sizeof(rectype));
|
|
if (rectype != DB_log_register) {
|
|
if (F_ISSET(dblp, DB_AM_THREAD)) {
|
|
__db_free(rec.data);
|
|
rec.data = NULL;
|
|
}
|
|
continue;
|
|
}
|
|
if ((ret = __log_register_read(rec.data, &argp)) != 0) {
|
|
ret = EINVAL;
|
|
__db_err(dblp->dbenv,
|
|
"log_archive: unable to read log record");
|
|
goto lg_free;
|
|
}
|
|
|
|
if (n >= array_size - 1) {
|
|
array_size += LIST_INCREMENT;
|
|
if ((array = (char **)__db_realloc(array,
|
|
sizeof(char *) * array_size)) == NULL) {
|
|
ret = ENOMEM;
|
|
goto lg_free;
|
|
}
|
|
}
|
|
|
|
if ((array[n] = (char *)__db_strdup(argp->name.data)) == NULL) {
|
|
ret = ENOMEM;
|
|
lg_free: if (F_ISSET(&rec, DB_DBT_MALLOC) && rec.data != NULL)
|
|
__db_free(rec.data);
|
|
goto err1;
|
|
}
|
|
|
|
array[++n] = NULL;
|
|
__db_free(argp);
|
|
|
|
if (F_ISSET(dblp, DB_AM_THREAD)) {
|
|
__db_free(rec.data);
|
|
rec.data = NULL;
|
|
}
|
|
}
|
|
|
|
/* If there's nothing to return, we're done. */
|
|
if (n == 0) {
|
|
ret = 0;
|
|
*listp = NULL;
|
|
goto err1;
|
|
}
|
|
|
|
/* Sort the list. */
|
|
qsort(array, (size_t)n, sizeof(char *), __cmpfunc);
|
|
|
|
/*
|
|
* Build the real pathnames, discarding nonexistent files and
|
|
* duplicates.
|
|
*/
|
|
for (last = nxt = 0; nxt < n;) {
|
|
/*
|
|
* Discard duplicates. Last is the next slot we're going
|
|
* to return to the user, nxt is the next slot that we're
|
|
* going to consider.
|
|
*/
|
|
if (last != nxt) {
|
|
array[last] = array[nxt];
|
|
array[nxt] = NULL;
|
|
}
|
|
for (++nxt; nxt < n &&
|
|
strcmp(array[last], array[nxt]) == 0; ++nxt) {
|
|
FREES(array[nxt]);
|
|
array[nxt] = NULL;
|
|
}
|
|
|
|
/* Get the real name. */
|
|
if ((ret = __db_appname(dblp->dbenv,
|
|
DB_APP_DATA, NULL, array[last], NULL, &real_name)) != 0)
|
|
goto err2;
|
|
|
|
/* If the file doesn't exist, ignore it. */
|
|
if (__db_exists(real_name, NULL) != 0) {
|
|
FREES(real_name);
|
|
FREES(array[last]);
|
|
array[last] = NULL;
|
|
continue;
|
|
}
|
|
|
|
/* Rework the name as requested by the user. */
|
|
FREES(array[last]);
|
|
array[last] = NULL;
|
|
if (pref != NULL) {
|
|
ret = __absname(pref, real_name, &array[last]);
|
|
FREES(real_name);
|
|
if (ret != 0)
|
|
goto err2;
|
|
} else if ((p = __db_rpath(real_name)) != NULL) {
|
|
array[last] = (char *)__db_strdup(p + 1);
|
|
FREES(real_name);
|
|
if (array[last] == NULL)
|
|
goto err2;
|
|
} else
|
|
array[last] = real_name;
|
|
++last;
|
|
}
|
|
|
|
/* NULL-terminate the list. */
|
|
array[last] = NULL;
|
|
|
|
/* Rework the memory. */
|
|
if ((ret = __usermem(&array, db_malloc)) != 0)
|
|
goto err1;
|
|
|
|
*listp = array;
|
|
return (0);
|
|
|
|
err2: /*
|
|
* XXX
|
|
* We've possibly inserted NULLs into the array list, so clean up a
|
|
* bit so that the other error processing works.
|
|
*/
|
|
if (array != NULL)
|
|
for (; nxt < n; ++nxt)
|
|
FREES(array[nxt]);
|
|
/* FALLTHROUGH */
|
|
|
|
err1: if (array != NULL) {
|
|
for (arrayp = array; *arrayp != NULL; ++arrayp)
|
|
FREES(*arrayp);
|
|
__db_free(array);
|
|
}
|
|
return (ret);
|
|
}
|
|
|
|
/*
|
|
* __absname --
|
|
* Return an absolute path name for the file.
|
|
*/
|
|
static int
|
|
__absname(pref, name, newnamep)
|
|
char *pref, *name, **newnamep;
|
|
{
|
|
size_t l_pref, l_name;
|
|
char *newname;
|
|
|
|
l_pref = strlen(pref);
|
|
l_name = strlen(name);
|
|
|
|
/* Malloc space for concatenating the two. */
|
|
if ((newname = (char *)__db_malloc(l_pref + l_name + 2)) == NULL)
|
|
return (ENOMEM);
|
|
|
|
/* Build the name. */
|
|
memcpy(newname, pref, l_pref);
|
|
if (strchr(PATH_SEPARATOR, newname[l_pref - 1]) == NULL)
|
|
newname[l_pref++] = PATH_SEPARATOR[0];
|
|
memcpy(newname + l_pref, name, l_name + 1);
|
|
*newnamep = newname;
|
|
|
|
return (0);
|
|
}
|
|
|
|
/*
|
|
* __usermem --
|
|
* Create a single chunk of memory that holds the returned information.
|
|
* If the user has their own malloc routine, use it.
|
|
*/
|
|
static int
|
|
__usermem(listp, cmpfunc)
|
|
char ***listp;
|
|
void *(*cmpfunc) __P((size_t));
|
|
{
|
|
size_t len;
|
|
char **array, **arrayp, **orig, *strp;
|
|
|
|
/* Find out how much space we need. */
|
|
for (len = 0, orig = *listp; *orig != NULL; ++orig)
|
|
len += sizeof(char *) + strlen(*orig) + 1;
|
|
len += sizeof(char *);
|
|
|
|
/*
|
|
* Allocate it and set up the pointers.
|
|
*
|
|
* XXX
|
|
* Don't simplify this expression, SunOS compilers don't like it.
|
|
*/
|
|
if (cmpfunc == NULL)
|
|
array = (char **)__db_malloc(len);
|
|
else
|
|
array = (char **)cmpfunc(len);
|
|
if (array == NULL)
|
|
return (ENOMEM);
|
|
strp = (char *)(array + (orig - *listp) + 1);
|
|
|
|
/* Copy the original information into the new memory. */
|
|
for (orig = *listp, arrayp = array; *orig != NULL; ++orig, ++arrayp) {
|
|
len = strlen(*orig);
|
|
memcpy(strp, *orig, len + 1);
|
|
*arrayp = strp;
|
|
strp += len + 1;
|
|
|
|
FREES(*orig);
|
|
}
|
|
|
|
/* NULL-terminate the list. */
|
|
*arrayp = NULL;
|
|
|
|
__db_free(*listp);
|
|
*listp = array;
|
|
|
|
return (0);
|
|
}
|
|
|
|
static int
|
|
__cmpfunc(p1, p2)
|
|
const void *p1, *p2;
|
|
{
|
|
return (strcmp(*((char **)p1), *((char **)p2)));
|
|
}
|