9a0a462ceb
1997-09-11 04:36 Ulrich Drepper <drepper@cygnus.com> * db2/db_int.h: Define __set_errno if not yet available. * db2/btree/bt_rec.c: Use __set_errno to set errno value. * db2/clib/getlong.c: Likewise. * db2/db185/db185.c: Likewise. * db2/db185/db185_int.h: Likewise. * db2/dbm/dbm.c: Likewise. * db2/lock/lock_deadlock.c: Likewise. * db2/log/log_archive.c: Likewise. * elf/dl-profile.c: Implement mcount function. * gmon/gmon.c: Use __profil not profil because of namespace pollution. * gmon/mcount.c: Remove BSD kernel code. Use compare&swap instruction if possible to change state variable. Optimize frompc folding. * gmon/sys/gmon.h (struct gmonparam): Change state field to long int. * sysdeps/i386/i486/atomicity.h: New file. * sysdeps/stub/atomicity.h: New file. * sysdeps/mach/hurd/profil.c: Define function as __profil and make profil weak alias. * sysdeps/posix/profil.c: Likewise. * string/bits/string2.h: New file. * include/bits/string2.h: New file. * string/Makefile (routines): Add mempcpy. (tests): Add inl-tester. Remove _D__NO_STRING_INLINES from CFLAGS-* variables. * sysdeps/generic/mempcpy.c: New file. * sysdeps/generic/memccpy.c: Undef function name to enable definition as macro. * sysdeps/generic/memchr.c: Likewise. * sysdeps/generic/memcmp.c: Likewise. * sysdeps/generic/memmem.c: Likewise. * sysdeps/generic/memmove.c: Likewise. * sysdeps/generic/strcat.c: Likewise. * sysdeps/generic/strchr.c: Likewise. * sysdeps/generic/strcmp.c: Likewise. * sysdeps/generic/strcpy.c: Likewise. * sysdeps/generic/strcspn.c: Likewise. * sysdeps/generic/strlen.c: Likewise. * sysdeps/generic/strncat.c: Likewise. * sysdeps/generic/strncmp.c: Likewise. * sysdeps/generic/strncpy.c: Likewise. * sysdeps/generic/strpbrk.c: Likewise. * sysdeps/generic/strrchr.c: Likewise. * sysdeps/generic/strsep.c: Likewise. * sysdeps/generic/strspn.c: Likewise. * sysdeps/generic/strstr.c: Likewise. * sysdeps/generic/strtok.c: Likewise. * sysdeps/generic/strtok_r.c: Likewise. * sysdeps/i386/memset.c: Likewise. * sysdeps/i386/bits/string.h: Correct a few types and constraints. * sysdeps/i386/i486/bits/string.h: Heavy rewrites and optimizations. * string/stratcliff.c: Undefine __USE_STRING_INLINES. * string/tst-strlen.c: Likewise. * string/string.h: Add prototype for mempcpy. Include bits/string2.h header always if optimizing. * intl/dcgettext.c: Don't unconditionally define stpcpy, only if not yet defined. * intl/l10nflist.c: Likewise. * string/tester.c: Add copyright and make little cleanups. * inet/test_ifindex.c: Change type of ni variable to unsigned int. * locale/programs/ld-ctype.c (struct locale_ctype_t): Change type of fields map_collection_max and map_collection_act to size_t. * nss/libnss_files.map: Group entries. * posix/unistd.h: Add prototype for __setpgid and __profil. * sysdeps/generic/crypt.h: Declare __crypt_r. * sysdeps/i386/bits/select.h: Fix fatal bugs, use correct casts now. * sysdeps/i386/fpu/bits/mathinline.h (isgreater, isgreaterequal, isless, islessequal, islessgreater, isunordered): Optimize a bit. * sysdeps/stub/ftruncate.c: Include missing header for prototype. * sysdeps/stub/getdents.c: Likewise. * sysdeps/stub/reboot.c: Likewise. * sysdeps/stub/swapon.c: Likewise. * sysdeps/stub/syscall.c: Likewise. * sysdeps/stub/ualarm.c: Likewise. * sysdeps/stub/usleep.c: Likewise. * sysdeps/unix/sysv/linux/if_index.c: Don't compile or use opensock if SIOGIFINDEX and SIOGIFNAME are not defined. * sysdeps/unix/sysv/linux/net/if.h: Add IFF_PORTSEL and IFF_AUTOMEDIA according to recent kernel changes. 1997-09-10 21:32 Klaus Espenlaub <kespenla@student.informatik.uni-ulm.de> * Makeconfig: Use $(have-initfini) instead of $(elf) to figure out the installed name of the startup code. (common-generated): Add version.mk. * Makefile (distclean-1): Add glibcbug. * Makerules: Replace -lgcc by $(gnulib). * catgets/Makefile (generated): Add xmalloc.o. * csu/Makefile (generated): Replace align.h and end.h by defs.h to match the generated file. * manual/Makefile (mostlyclean): Add stub-manual and stamp.o. (realclean): Changed to remove chapters-incl[12]. * po/Makefile (realclean): New rule to remove the generated .mo files. * time/Makefile: Only include zonefile dependencies if $(no_deps) is not true to avoid make clean failure when directory time doesn't exist yet. (generated): Add tzselect. * stdio/fgets.c (fgets): Add casts to reduce gcc warning noise. * stdio/internals.c (flushbuf): Likewise. * stdio/linewrap.c (lwupdate): Likewise. * stdio/memstream.c (enlarge_buffer): Likewise. * stdio-common/vfscanf.c (_IO_vfscanf): Likewise. * time/tzset.c (compute_change): Likewise. * misc/init-misc.c (__init_misc): Only declare static if HAVE_GNU_LD is defined. * sysdeps/posix/pipestream.c (FUNC): Change to generate ANSI C style functions. * sysdeps/stub/init-posix.c: Likewise. * sysdeps/stub/profil.c: Likewise. * munch-tmpl.c (__libc_init): Convert to ANSI C style declaration to reduce gcc warning noise. * stdio/glue.c (_filbuf, _flsbuf): Likewise. * stdio/obstream.c (grow, seek, input, init_obstream): Likewise. * stdio/vasprintf.c (enlarge_buffer): Likewise. * sysdeps/generic/sysd-stdio.c (__stdio_read, __stdio_write, __stdio_seek, __stdio_close, __stdio_fileno, __stdio_open, __stdio_reopen): Likewise. * sysdeps/posix/defs.c (_cleanup): Likewise. * time/offtime.c (__offtime): Add cast. * posix/getopt.c: Don't use text_set_element if not defined. * configure.in: Provide a check for underscores before user labels that works even when the compiler used for building doesn't work (like when there is no C library). Use the old way if the compiler works. 1997-09-10 05:08 David S. Miller <davem@caip.rutgers.edu> * sysdeps/unix/sysv/linux/sparc/bits/ioctls.h: The TC* ioctls use 'T' not 't' on SparcLinux. * sysdeps/unix/sysv/linux/sparc/bits/termios.h: tcflag_t is 32 bits. * sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S: Add aliases for _longjmp and siglongjmp. 1997-09-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * libio/stdio.h: Add format attributes to the extra printf and scanf like functions. * stdio/stdio.h: Likewise. 1997-09-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * nis/nss_nisplus/nisplus-network.c (_nss_nisplus_getnetbyaddr_r): Print tablename_val, not tablename_len. * nis/nss_nisplus/nisplus-ethers.c (_nss_nisplus_getntohost_r): Use sprintf instead of sprintf, the string always fits. * nis/nss_nisplus/nisplus-hosts.c (_nss_nisplus_gethostbyaddr_r): Likewise. * nis/nss_nisplus/nisplus-network.c (_nss_nisplus_getnetbyaddr_r): Likewise. * nis/nss_nisplus/nisplus-proto.c (_nss_nisplus_getprotobynumber_r): Likewise. * nis/nss_nisplus/nisplus-rpc.c (_nss_nisplus_getrpcbynumber_r): Likewise. * nis/nss_nisplus/nisplus-service.c (_nss_nisplus_getservbynumber_r): Likewise. * nis/nss_nisplus/nisplus-alias.c (_nss_create_tablename): Use __stpcpy, __stpncpy and __strdup instead of public names. * nis/nss_nisplus/nisplus-ethers.c (_nss_create_tablename): Likewise. * nis/nss_nisplus/nisplus-grp.c (_nss_create_tablename): Likewise. * nis/nss_nisplus/nisplus-hosts.c (_nss_create_tablename): Likewise. * nis/nss_nisplus/nisplus-netgrp.c (_nss_nisplus_parse_netgroup): Likewise. * nis/nss_nisplus/nisplus-network.c (_nss_nisplus_parse_netent): Likewise. (_nss_create_tablename): Likewise. * nis/nss_nisplus/nisplus-proto.c (_nss_nisplus_parse_protoent): Likewise. (_nss_create_tablename): Likewise. * nis/nss_nisplus/nisplus-pwd.c (_nss_create_tablename): Likewise. * nis/nss_nisplus/nisplus-rpc.c (_nss_nisplus_parse_rpcent): Likewise. (_nss_create_tablename): Likewise. * nis/nss_nisplus/nisplus-service.c (_nss_nisplus_parse_servent): Likewise. (_nss_create_tablename): Likewise. * nis/nss_nisplus/nisplus-spwd.c (_nss_create_tablename): Likewise. * libc.map: Export __stpcpy and __strdup. 1997-09-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * math/Makefile (CFLAGS-test-float.c, CFLAGS-test-double.c, CFLAGS-test-ldouble.c): Pass -ffloat-store to avoid excessive precision. 1997-09-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * include/rpc/auth_des.h: New file. 1997-09-09 Paul Eggert <eggert@twinsun.com> * time/mktime.c (__mktime_internal): Declare sec_requested even if !LEAP_SECONDS_POSSIBLE, since it's needed at the end when checking for time_t overflow. 1997-09-09 22:11 Ulrich Drepper <drepper@cygnus.com> * sysdeps/posix/getcwd.c: Correct test for too small buffer. Reported by Erik Troan <ewt@redhat.com>. * elf/dl-close.c: Include <bits/libc-lock.h>, not <libc-lock.h>. * elf/dl-open.c: Likewise. 1997-09-07 17:09 Richard Henderson <rth@cygnus.com> * sysdeps/alpha/Makefile: Kill setjmp_aux. * sysdeps/alpha/bits/setjmp.h: Rewrite in terms of an array. * sysdeps/alpha/__longjmp.c: Remove. * sysdeps/alpha/setjmp_aux.c: Remove. * sysdeps/alpha/__longjmp.S: New file. * sysdeps/alpha/bsd-_setjmp.S: Stub out. * sysdeps/alpha/bsd-setjmp.S: Likewise. * sysdeps/alpha/setjmp.S: Do the work; don't call __setjmp_aux. Move _setjmp and setjmp from bsd-*.S. 1997-09-06 20:20 Ulrich Drepper <drepper@cygnus.com> * include/rpc/auth.h: New file. * include/rpc/auth_unix.h: New file. 1997-09-06 Paul Eggert <eggert@twinsun.com> Fix gmtime so that it reports leap seconds when TZ indicates that leap seconds are desired. * time/gmtime.c (<stddef.h>): Remove unnecessary include. (gmtime): Put after gmtime_r, to help the compiler inline. (__tz_convert): New decl. (gmtime_r): Use __tz_convert instead of __offtime, so that leap seconds are handled correctly. * time/localtime.c (<errno.h>, <libc-lock.h>): Remove includes that are now unnecessary. (__tzset_internal, __tz_compute, __tzfile_compute, __use_tzfile, __tzset_lock): Remove extern decls that are now unnecessary. (localtime_internal): Moved to __tz_convert in tzset.c. so that localtime and gmtime can both use it easily. (localtime): Put after localtime_r, to help the compiler inline. (localtime_r): Use __tz_convert instead of localtime_internal. * time/strftime.c (__tz_compute): Remove unused (and now incorrect) decl. * time/tzfile.c (__tzfile_compute): New arg USE_LOCALTIME. * time/tzset.c (<errno.h>): Include. (_tmbuf): New decl. (__tzfile_compute): New function. (tz_compute): Renamed from __tz_compute. No longer extern. Remove redundant call to tzset_internal. (tzset_internal): Renamed from __tzset_internal. No longer extern. (tzset_lock): Renamed from __tzset_lock. No longer extern. (__tz_convert): New function, containing functionality of old localtime_internal function, plus locking and optional UTC. 1997-09-06 Paul Eggert <eggert@twinsun.com> * time/tzfile.c (__tzfile_read): Don't read a file if TZ is the empty string, just use UTC without leap seconds. This is for compatibility with the Olson code. 1997-09-06 Paul Eggert <eggert@twinsun.com> * time/tzset.c (__tzname_max): Lock tz data structures before invoking tzset_internal. * time/tzfile.c: Define compute_tzname_max statically. 1997-09-07 10:57 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/nis_call.c: Remove not longer necessary HAVE_SECURE_RPC ifdefs. * nis/nis_intern.h: Likewise. * nis/nss_nis/nis-publickey.c: Likewise. * nis/nss_nisplus/nisplus-publickey.c: Likewise. * nis/ypclnt.c: Likewise. * sunrpc/auth_des.c: Don't dereference NULL pointer, initialize ad->ad_timediff. * sunrpc/auth_none.c: Don't define our own prototypes, use the one from the header files. * sunrpc/auth_unix.c: Likewise. * sunrpc/clnt_raw.c: Likewise. * sunrpc/clnt_tcp.c: Likewise. * sunrpc/rpc_cmsg.c: Likewise. * sunrpc/key_call.c: Fix signal handling. * sunrpc/openchild.c: Don't use /bin/sh to start /usr/etc/keyenvoy, or we will get a deadlock with NIS+. * sunrpc/rpc/auth.h: Add prototype for xdr_opaque_auth, don't define HAVE_SECURE_RPC. 1997-09-07 15:51 Ulrich Drepper <drepper@cygnus.com> * sysdeps/i386/bits/select.h [__GNUC__] (__FD_ZERO, __FD_SET, __FD_CLR, __FD_ISSET): Use correct casts to address array correctly. Reported by urbanw@cs.umu.se. 1997-09-07 05:07 Ulrich Drepper <drepper@cygnus.com> * elf/dl-close.c: Include <bits/libc-lock.h>, not <libc-lock.h>. * elf/dl-open.c: Likewise. * sysdeps/i386/memset.c: Undefine memset in case the header with the optimized functions is included. Patches by NIIBE Yutaka <gniibe@mri.co.jp>. * sysdeps/i386/bits/string.h [__PIC__] (strcspn, strspn, strpbrk, strsep): Use register for second parameter. * sysdeps/i386/i486/bits/string.h: Likewise. Reported by NIIBE Yutaka <gniibe@mri.co.jp>. 1997-09-03 09:48 Geoff Keating <geoffk@ozemail.com.au> * math/libm-test.c: Change various tolerances to match what the tested routines can actually provide. * math/Makefile: Add new tests. * math/atest-sincos.c: New file. * math/atest-exp.c: New file. * csu/Makefile: Give initfini.s and initfiniS.s their own CFLAGS-* macros so they can be overridden. * sysdeps/powerpc/Makefile [subdir=csu]: Override flags for initfiniS.s to use -fpic instead of -fPIC, because the sed script breaks otherwise. * sysdeps/powerpc/Makefile [build-shared]: Use -fpic not -fPIC for efficiency. * sysdeps/powerpc/dl-machine.h (ELF_MACHINE_RUNTIME_TRAMPOLINE): Don't use register 0, to let _mcount be in a shared object. * sysdeps/powerpc/dl-machine.h: Use full sentences in comments. Generally clean up. Suppress some code we don't need when relocating ld.so. * sysdeps/powerpc/test-arith.c: Change loop indices to size_t when appropriate to suppress gcc warning. * resolv/res_send.c: Suppress warning. * sunrpc/xdr_sizeof.c: Suppress warning. * FAQ: Add ppc-linux. * manual/maint.texi: Add ppc-linux. Explain that gcc can't build it yet. * sysdeps/unix/sysv/linux/powerpc/profil-counter.h: Correct for current kernels. 1997-08-15 07:45 Geoff Keating <geoffk@ozemail.com.au> * stdlib/fmtmsg.c: Use two parameters for __libc_once_define. * sysdeps/i386/machine-gmon.h: Correct typo. * sysdeps/unix/sysv/linux/powerpc/bits/mman.h: Change to match kernel. * sysdeps/generic/dl-sysdep.c: Add hook for bizzare PPC argument hack. * sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c: Rewrite to use sysdeps/linux/dl-sysdep.c. * sysdeps/powerpc/Makefile [subdir=gmon]: Compile ppc-mcount. * sysdeps/powerpc/machine-gmon.h: Use ppc-mcount. * sysdeps/powerpc/ppc-mcount: New file. The following are mostly changes to allow profiling: * sysdeps/powerpc/add_n.S: Added. * sysdeps/powerpc/add_n.s: Removed. * sysdeps/powerpc/addmul_1.S: Added. * sysdeps/powerpc/addmul_1.s: Removed. * sysdeps/powerpc/bsd-_setjmp.S: Use JUMPTARGET macro. * sysdeps/powerpc/bsd-setjmp.S: Use JUMPTARGET macro. * sysdeps/powerpc/lshift.S: Added. * sysdeps/powerpc/lshift.s: Removed. * sysdeps/powerpc/memset.S: Added. * sysdeps/powerpc/memset.s: Removed. * sysdeps/powerpc/mul_1.S: Added. * sysdeps/powerpc/mul_1.s: Removed. * sysdeps/powerpc/rshift.S: Added. * sysdeps/powerpc/rshift.s: Removed. * sysdeps/powerpc/s_copysign.S: Use ENTRY, END, weak_alias macros. * sysdeps/powerpc/s_fabs.S: Use ENTRY, END, weak_alias macros. * sysdeps/powerpc/setjmp.S: Use JUMPTARGET macro. * sysdeps/powerpc/strchr.S: Added. * sysdeps/powerpc/strchr.s: Removed. * sysdeps/powerpc/strcmp.S: Added. * sysdeps/powerpc/strcmp.s: Removed. * sysdeps/powerpc/strlen.S: Added. * sysdeps/powerpc/strlen.s: Removed. * sysdeps/powerpc/sub_n.S: Added. * sysdeps/powerpc/sub_n.s: Removed. * sysdeps/powerpc/submul_1.S: Added. * sysdeps/powerpc/submul_1.s: Removed. * sysdeps/unix/sysv/linux/powerpc/_exit.S: Removed. * sysdeps/unix/sysv/linux/powerpc/brk.S: Added. * sysdeps/unix/sysv/linux/powerpc/brk.c: Removed. * sysdeps/unix/sysv/linux/powerpc/clone.S: Use new macros. Fix various bugs. Document that it isn't tested. * sysdeps/unix/sysv/linux/powerpc/sigreturn.S: Make look like sysdeps/unix/_exit.S. * sysdeps/unix/sysv/linux/powerpc/socket.S: Use new macros. * sysdeps/unix/sysv/linux/powerpc/syscall.S: Use new macros. * sysdeps/unix/sysv/linux/powerpc/sysdep.h: Define some new macros to make assembler (possibly) more portable, allow profiling, etc.
414 lines
8.9 KiB
C
414 lines
8.9 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.23 (Sleepycat) 8/23/97";
|
|
#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(logp, listp, flags, db_malloc)
|
|
DB_LOG *logp;
|
|
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];
|
|
|
|
fnum = 0; /* XXX: Shut the compiler up. */
|
|
|
|
#define OKFLAGS (DB_ARCH_ABS | DB_ARCH_DATA | DB_ARCH_LOG)
|
|
if (flags != 0) {
|
|
if ((ret =
|
|
__db_fchk(logp->dbenv, "log_archive", flags, OKFLAGS)) != 0)
|
|
return (ret);
|
|
if ((ret =
|
|
__db_fcchk(logp->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)) {
|
|
__set_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(logp, pref, listp, db_malloc));
|
|
case DB_ARCH_LOG:
|
|
memset(&rec, 0, sizeof(rec));
|
|
if (F_ISSET(logp, DB_AM_THREAD))
|
|
F_SET(&rec, DB_DBT_MALLOC);
|
|
if ((ret = log_get(logp, &stable_lsn, &rec, DB_LAST)) != 0)
|
|
return (ret);
|
|
if (F_ISSET(logp, DB_AM_THREAD))
|
|
free(rec.data);
|
|
fnum = stable_lsn.file;
|
|
break;
|
|
case 0:
|
|
if ((ret = __log_findckp(logp, &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 **)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(logp->dbenv, fnum, &name)) != 0)
|
|
goto err;
|
|
if (__db_exists(name, NULL) != 0)
|
|
break;
|
|
|
|
if (n >= array_size - 1) {
|
|
array_size += LIST_INCREMENT;
|
|
if ((array = (char **)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 *)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);
|
|
free(array);
|
|
}
|
|
return (ret);
|
|
}
|
|
|
|
/*
|
|
* build_data --
|
|
* Build a list of datafiles for return.
|
|
*/
|
|
static int
|
|
build_data(logp, pref, listp, db_malloc)
|
|
DB_LOG *logp;
|
|
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 **)malloc(sizeof(char *) * (array_size = 10))) == NULL)
|
|
return (ENOMEM);
|
|
array[0] = NULL;
|
|
|
|
memset(&rec, 0, sizeof(rec));
|
|
if (F_ISSET(logp, DB_AM_THREAD))
|
|
F_SET(&rec, DB_DBT_MALLOC);
|
|
for (n = 0, ret = log_get(logp, &lsn, &rec, DB_FIRST);
|
|
ret == 0; ret = log_get(logp, &lsn, &rec, DB_NEXT)) {
|
|
if (rec.size < sizeof(rectype)) {
|
|
ret = EINVAL;
|
|
__db_err(logp->dbenv, "log_archive: bad log record");
|
|
goto lg_free;
|
|
}
|
|
|
|
memcpy(&rectype, rec.data, sizeof(rectype));
|
|
if (rectype != DB_log_register) {
|
|
if (F_ISSET(logp, DB_AM_THREAD)) {
|
|
free(rec.data);
|
|
rec.data = NULL;
|
|
}
|
|
continue;
|
|
}
|
|
if ((ret = __log_register_read(rec.data, &argp)) != 0) {
|
|
ret = EINVAL;
|
|
__db_err(logp->dbenv,
|
|
"log_archive: unable to read log record");
|
|
goto lg_free;
|
|
}
|
|
|
|
if (n >= array_size - 1) {
|
|
array_size += LIST_INCREMENT;
|
|
if ((array = (char **)realloc(array,
|
|
sizeof(char *) * array_size)) == NULL) {
|
|
ret = ENOMEM;
|
|
goto lg_free;
|
|
}
|
|
}
|
|
|
|
if ((array[n] = (char *)strdup(argp->name.data)) == NULL) {
|
|
ret = ENOMEM;
|
|
lg_free: if (F_ISSET(&rec, DB_DBT_MALLOC) && rec.data != NULL)
|
|
free(rec.data);
|
|
goto err1;
|
|
}
|
|
|
|
array[++n] = NULL;
|
|
free(argp);
|
|
|
|
if (F_ISSET(logp, DB_AM_THREAD)) {
|
|
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(logp->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 *)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);
|
|
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 *)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, func)
|
|
char ***listp;
|
|
void *(*func) __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 (func == NULL)
|
|
array = (char **)malloc(len);
|
|
else
|
|
array = (char **)func(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;
|
|
|
|
free(*listp);
|
|
*listp = array;
|
|
|
|
return (0);
|
|
}
|
|
|
|
static int
|
|
cmpfunc(p1, p2)
|
|
const void *p1, *p2;
|
|
{
|
|
return (strcmp(*((char **)p1), *((char **)p2)));
|
|
}
|