mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-20 01:40:26 +00:00
cc3fa75512
1997-11-11 21:30 Ulrich Drepper <drepper@cygnus.com> * include/sys/stat.h: Define stat, fstat, lstat and *64 variants as macros so the the library compiles correctly even without optimization. * io/fstat.c: Undef fstat. * io/fstat64.c: Undef fstat64 * io/lstat.c: Undef lstat. * io/lstat64.c: Undef lstat64 * io/stat.c: Undef stat. * io/stat64.c: Undef stat64 * io/fts.c: Include <include/sys/stat.h> to get macro definitions. * io/ftw.c: Likewise. * io/getdirname.c: Likewise. * Makefile (install): Run test-installation.pl if possible. * db2/Makefile: Update from db-2.3.12. * db2/db.h: Likewise. * db2/db_int.h: Likewise. * db2/btree/bt_cursor.c: Likewise. * db2/btree/bt_delete.c: Likewise. * db2/btree/bt_open.c: Likewise. * db2/btree/bt_put.c: Likewise. * db2/btree/bt_rec.c: Likewise. * db2/btree/bt_recno.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/btree/btree_auto.c: Likewise. * db2/btree/bt_cursor.c: Likewise. * db2/btree/bt_delete.c: Likewise. * db2/btree/bt_open.c: Likewise. * db2/btree/bt_put.c: Likewise. * db2/btree/bt_rec.c: Likewise. * db2/btree/bt_recno.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/btree/btree_auto.c: Likewise. * db2/common/db_appinit.c: Likewise. * db2/common/db_apprec.c: Likewise. * db2/common/db_byteorder.c: Likewise. * db2/common/db_region.c: Likewise. * db2/db/db.c: Likewise * db2/db/db.src: Likewise * db2/db/db_auto.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/db185/db185.c: Likewise. * db2/hash/hash.c: Likewise. * db2/hash/hash.src: 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_auto.h: 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_am.h: Likewise. * db2/include/db_auto.h: Likewise. * db2/include/db_cxx.h: Likewise. * db2/include/db_ext.h: Likewise. * db2/include/db_int.h.src: Likewise. * db2/include/hash.h: Likewise. * db2/include/hash_auto.h: Likewise. * db2/include/hash_ext.h: Likewise. * db2/include/lock.h: Likewise. * db2/include/lock_ext.h: Likewise. * db2/include/log.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.h: Likewise. * db2/include/txn_ext.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_findckp.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_fset.c: Likewise. * db2/mp/mp_open.c: Likewise. * db2/mp/mp_pr.c: Likewise. * db2/mp/mp_region.c: Likewise. * db2/mp/mp_sync.c: Likewise. * db2/mutex/mutex.c: Likewise. * db2/os/os_abs.c: Likewise. * db2/os/os_dir.c: Likewise. * db2/os/os_fid.c: Likewise. * db2/os/os_fsync.c: Likewise. * db2/os/os_func.c: Likewise. * db2/os/os_map.c: Likewise. * db2/os/os_oflags.c: Likewise. * db2/os/os_open.c: Likewise. * db2/os/os_rpath.c: Likewise. * db2/os/os_rw.c: Likewise. * db2/os/os_seek.c: Likewise. * db2/os/os_sleep.c: Likewise. * db2/os/os_stat.c: Likewise. * db2/os/os_unlink.c: Likewise. * db2/progs/db_deadlock/db_deadlock.c: Likewise. * db2/progs/db_dump/db_dump.c: Likewise. * db2/progs/db_load/db_load.c: Likewise. * db2/progs/db_recover/db_recover.c: Likewise. * db2/progs/db_stat/db_stat.c: Likewise. * db2/txn/txn.c: Likewise. * db2/txn/txn_auto.c: Likewise. * db2/txn/txn_rec.c: Likewise. * db2/os/db_os_abs.c: Removed. * db2/os/db_os_dir.c: Removed. * db2/os/db_os_fid.c: Removed. * db2/os/db_os_lseek.c: Removed. * db2/os/db_os_mmap.c: Removed. * db2/os/db_os_open.c: Removed. * db2/os/db_os_rw.c: Removed. * db2/os/db_os_sleep.c: Removed. * db2/os/db_os_stat.c: Removed. * db2/os/db_os_unlink.c: Removed. * libio/stdio.h (fopen): Add __restrict to parameters. * manual/process.texi (system): Describe behaviour for NULL argument. * stdio-common/printf-parse.h: Parse hh modifier. * stdio-common/vfprintf.c: Handle hh modifier. * stdio-common/vfscanf.c: Likewise. * manual/stdio.texi: Describe hh modifier for scanf/printf. * math/complex.h: Don't define _Imaginary_I, but instead _Complex_I. gcc does no yet know the `imaginary' keyword. * math/test-math.c: Add little test for know gcc bug. * math/tgmath.h: Make complex versions of log10() only available if __USE_GNU. * stdlib/test-canon.c: Fix typo. * sysdeps/generic/setenv.c: Avoid compilation warnings. Reported by Jim Meyering. * sysdeps/generic/bits/errno.h: EILSEQ is an ISO C error number. * sysdeps/mach/hurd/bits/errno.h: Likewise. * sysdeps/standalone/bits/errno.h: Likewise. * sysdeps/unix/sysv/linux/bits/errno.h: Likewise. * sysdeps/i386/i586/memcpy.S: New file. * sysdeps/i386/i586/mempcpy.S: New file. * sysdeps/i386/i586/memset.S: Fix typo. * sysdeps/posix/getcwd.c: Define HAVE_MEMPCPY for _LIBC. Add casts. * sysdeps/posix/system.c: Add comment to explain code. * sysdeps/wordsize-32/inttypes.h: Include <stddef.h> for wchar_t. Define PTRDIFF_{MIN,MAX}, SIG_ATOMIC_{MIN,MAX}, SIZE_MAX, WCHAR_{MIN,MAX}, WINT_{MIN,MAX}. Define wcstoimax, wcstoumax. * sysdeps/wordsize-64/inttypes.h: Likewise. * wcsmbs/wchar.h: Define WCHAR_{MIN,MAX} if not already defined. Declare __wcsto{l,ul,ll,ull}_internal only if not already done. * time/Makefile (routines): Add strfxtime. * time/strftime.c: Implement %F and %f format. * time/strfxtime.c: New file. * time/time.h: Define new types and symbols from ISO C 9X. * time/mktime.c: Little comment correction. 1997-11-10 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/libm-ieee754/s_sincosl.c: Fix typo. * sysdeps/libm-ieee754/s_tanl.c: Fix typo. * sysdeps/libm-ieee754/s_floorl.c: Correct typos. * sysdeps/libm-ieee754/e_remainderl.c: Replace EXTRACT_LDOUBLE_WORDS by GET_LDOUBLE_WORDS. * sysdeps/libm-ieee754/e_atan2l.c: Replace EXTRACT_LDOUBLE_WORDS by GET_LDOUBLE_WORDS. * sysdeps/libm-ieee754/s_scalbnl.c: Replace ";" by "," for correct variable declaration. * sysdeps/libm-ieee754/s_scalblnl.c: Likewise. * sysdeps/libm-ieee754/s_lrint.c (__lrint): Correct function. * math/libm-test.c (sqrt_test): Add test for sqrt (0.25). (asin_test): Add more test. 1997-11-10 23:34 Ulrich Drepper <drepper@cygnus.com> * sysdeps/libm-ieee754/e_asin.c: Add braces to make code clearer and to not confuse the poor compiler. * sysdeps/libm-ieee754/e_asinf.c: Likewise. Reported by vertex@cagent.com. 1997-11-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * elf/dl-lookup.c (do_lookup): Don't accept the base version if we require a specific one. * libio/oldfreopen.c: Bind old symbols to version GLIBC_2.0. * libio/oldiofopen.c: Likewise. * libio/oldstdfiles.c: Likewise. * libc.map: Export them. 1997-11-10 07:40 H.J. Lu <hjl@gnu.ai.mit.edu> * stdlib/exit.c (exit): Handle recursive calls to exit (). 1997-11-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/fpu/s_llrint.c: Fixed to take double argument instead of long double. * sysdeps/m68k/fpu/s_llrintf.c: New file. * sysdeps/m68k/fpu/s_llrintl.c: New file. * sysdeps/libm-ieee754/s_llrint.c: Make compilable and fix overflow condition. * sysdeps/libm-ieee754/s_llrintf.c: Fix overflow condition. * sysdeps/libm-ieee754/s_llrintl.c: Likewise. * sysdeps/libm-ieee754/s_llround.c: Likewise. * sysdeps/libm-ieee754/s_llroundf.c: Likewise. * sysdeps/libm-ieee754/s_llroundl.c: Likewise. * sysdeps/libm-ieee754/s_lrint.c: Likewise. * sysdeps/libm-ieee754/s_lrintf.c: Likewise. * sysdeps/libm-ieee754/s_lrintl.c: Likewise. * sysdeps/libm-ieee754/s_lround.c: Likewise. * sysdeps/libm-ieee754/s_lroundf.c: Likewise. * sysdeps/libm-ieee754/s_lroundl.c: Likewise. * math/libm-test.c: Test all three variants of lrint and llrint. Fix typos in lround and llround tests. Add tests for boundary cases for lrint and llround. 1997-11-08 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * manual/arith.texi: Misc doc fixes. * manual/ctype.texi: Likewise. * manual/pattern.texi: Likewise. * manual/terminal.texi: Likewise. 1997-11-08 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/xstatconv.c: Use struct assignment instead of memcpy to let the compiler use whatever it regards as optimal. * sysdeps/unix/sysv/linux/alpha/xstatconv.c: Likewise. 1997-11-08 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/Makefile (sysdep_headers) [$(subdir)=misc]: Add sys/prctl.h. * sysdeps/unix/sysv/linux/Dist: Distribute it. 1997-11-08 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * io/ftwtest-sh: Don't use the unknown which command, instead try pwd as /bin/pwd and /usr/bin/pwd. 1997-11-08 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * manual/maint.texi (Tools for Installation): Don't recommend broken version 3.76.1 of make. (Porting): Fix wording. 1997-11-06 06:13 H.J. Lu <hjl@gnu.ai.mit.edu> * config.make.in (build-pic-default): New, defined with pic_default. * configure.in (pic_default): New, set to yes if PIC is default. * Makeconfig (CPPFLAGS-.o, CPPFLAGS-.op, CPPFLAGS-.og, CPPFLAGS-.ob): Add -DPIC if $(build-pic-default) is yes. 1997-11-09 18:15 Ulrich Drepper <drepper@cygnus.com> * Makerules (libc.so): Fix typo. * csu/Makefile (CFLAGS-initfini.s): Correctly fix moving function definition. Patch by Zack Weinberg <zack@rabi.phys.columbia.edu>. * stdlib/strtod.c: Handle numbers like 0.0e10000 correctly which produce ±0.0. Reported by Joe Keane <jgk@jgk.org>. * sysdeps/libm-ieee754/s_ceill.c: Fix typos. * sysdeps/libm-ieee754/s_llrint.c: Correct code, it never worked. 1997-11-06 07:00 H.J. Lu <hjl@gnu.ai.mit.edu> * sysdeps/unix/sysv/i386/i686/time.S: Removed. 1997-11-08 14:07 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/libnsl.map: Add __do_niscall2 for nis_cachemgr. * nis/nis_call.c: Set UDP resend timeout correct. * nis/nss_compat/compat-grp.c: Rewritten to make it faster. * nis/nss_compat/compat-pwd.c: Likewise. * nis/nss_compat/compat-spwd.c: Likewise. * nis/ypclnt.c: Fix UDP resend timeout, fix yp_bind/do_ypcall interaction. * inet/protocols/routed.h: Include sys/socket.h. * inet/protocols/talkd.h: Likewise. * inet/protocols/timed.h: Include rpc/types.h. * sunrpc/rpc/pmap_clnt.h: Include rpc/clnt.h. 1997-11-06 01:39 Ulrich Drepper <drepper@cygnus.com> * Makerules (libc.so): Add missing closing brace. 1997-11-05 Brendan Kehoe <brendan@lisa.cygnus.com> * libio.h (__P): Name its arg `p' instead of `params'. This was added solely to work around problems with the definition of __P in the Solaris math.h header.
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.28 (Sleepycat) 10/28/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(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];
|
|
|
|
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(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, 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 **)__db_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;
|
|
|
|
__db_free(*listp);
|
|
*listp = array;
|
|
|
|
return (0);
|
|
}
|
|
|
|
static int
|
|
__cmpfunc(p1, p2)
|
|
const void *p1, *p2;
|
|
{
|
|
return (strcmp(*((char **)p1), *((char **)p2)));
|
|
}
|