mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-17 18:40:14 +00:00
bf7997b65c
1998-06-09 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/netinet/ip.h (struct ip_options): Define __data member only for gcc. Reported by ak@muc.de. * misc/mntent.h: Undo last patch. * sysdeps/unix/sysv/linux/fstatvfs.c (fstatvfs): Undo last patch. * misc/tst/mntent.c: Adjust code for this change. * io/fts.c: Updated from a slightly more recent BSD version. * io/fts.h: Likewise. * libc.map: Add __libc_stack_end. * db2/Makefile (routines): Add lock_region. * db2/config.h: Update from db-2.4.14. * db2/db.h: Likewise. * db2/db_185.h: Likewise. * db2/db_int.h: Likewise. * db2/bt_close.c: Likewise. * db2/bt_compare.c: Likewise. * db2/bt_conv.c: Likewise. * db2/bt_cursor.c: Likewise. * db2/bt_delete.c: Likewise. * db2/bt_open.c: Likewise. * db2/bt_page.c: Likewise. * db2/bt_put.c: Likewise. * db2/bt_rec.c: Likewise. * db2/bt_recno.c: Likewise. * db2/bt_rsearch.c: Likewise. * db2/bt_search.c: Likewise. * db2/bt_split.c: Likewise. * db2/bt_stat.c: Likewise. * db2/btree.src: Likewise. * db2/btree_auto.c: Likewise. * db2/getlong.c: Likewise. * db2/db_appinit.c: Likewise. * db2/db_apprec.c: Likewise. * db2/db_byteorder.c: Likewise. * db2/db_err.c: Likewise. * db2/db_log2.c: Likewise. * db2/db_region.c: Likewise. * db2/db_salloc.c: Likewise. * db2/db_shash.c: Likewise. * db2/db.c: Likewise. * db2/db.src: Likewise. * db2/db_auto.c: Likewise. * db2/db_conv.c: Likewise. * db2/db_dispatch.c: Likewise. * db2/db_dup.c: Likewise. * db2/db_overflow.c: Likewise. * db2/db_pr.c: Likewise. * db2/db_rec.c: Likewise. * db2/db_ret.c: Likewise. * db2/db_thread.c: Likewise. * db2/db185.c: Likewise. * db2/db185_int.h: Likewise. * db2/dbm.c: Likewise. * db2/hash.c: Likewise. * db2/hash.src: Likewise. * db2/hash_auto.c: Likewise. * db2/hash_conv.c: Likewise. * db2/hash_debug.c: Likewise. * db2/hash_dup.c: Likewise. * db2/hash_func.c: Likewise. * db2/hash_page.c: Likewise. * db2/hash_rec.c: Likewise. * db2/hash_stat.c: Likewise. * db2/btree.h: Likewise. * db2/btree_ext.h: Likewise. * db2/clib_ext.h: Likewise. * db2/common_ext.h: Likewise. * db2/cxx_int.h: Likewise. * db2/db.h.src: Likewise. * db2/db_185.h.src: Likewise. * db2/db_am.h: Likewise. * db2/db_auto.h: Likewise. * db2/db_cxx.h: Likewise. * db2/db_dispatch.h: Likewise. * db2/db_ext.h: Likewise. * db2/db_int.h.src: Likewise. * db2/db_page.h: Likewise. * db2/db_shash.h: Likewise. * db2/db_swap.h: Likewise. * db2/hash.h: Likewise. * db2/hash_ext.h: Likewise. * db2/lock.h: Likewise. * db2/lock_ext.h: Likewise. * db2/log.h: Likewise. * db2/log_ext.h: Likewise. * db2/mp.h: Likewise. * db2/mp_ext.h: Likewise. * db2/mutex_ext.h: Likewise. * db2/os_ext.h: Likewise. * db2/os_func.h: Likewise. * db2/queue.h: Likewise. * db2/shqueue.h: Likewise. * db2/txn.h: Likewise. * db2/lock.c: Likewise. * db2/lock_conflict.c: Likewise. * db2/lock_deadlock.c: Likewise. * db2/lock_region.c: Likewise. * db2/lock_util.c: Likewise. * db2/log.c: Likewise. * db2/log.src: Likewise. * db2/log_archive.c: Likewise. * db2/log_auto.c: Likewise. * db2/log_compare.c: Likewise. * db2/log_findckp.c: Likewise. * db2/log_get.c: Likewise. * db2/log_put.c: Likewise. * db2/log_rec.c: Likewise. * db2/log_register.c: Likewise. * db2/mp_bh.c: Likewise. * db2/mp_fget.c: Likewise. * db2/mp_fopen.c: Likewise. * db2/mp_fput.c: Likewise. * db2/mp_fset.c: Likewise. * db2/mp_open.c: Likewise. * db2/mp_pr.c: Likewise. * db2/mp_region.c: Likewise. * db2/mp_sync.c: Likewise. * db2/68020.gcc: Likewise. * db2/mutex.c: Likewise. * db2/parisc.gcc: Likewise. * db2/parisc.hp: Likewise. * db2/sco.cc: Likewise. * db2/os_abs.c: Likewise. * db2/os_alloc.c: Likewise. * db2/os_config.c: Likewise. * db2/os_dir.c: Likewise. * db2/os_fid.c: Likewise. * db2/os_fsync.c: Likewise. * db2/os_map.c: Likewise. * db2/os_oflags.c: Likewise. * db2/os_open.c: Likewise. * db2/os_rpath.c: Likewise. * db2/os_rw.c: Likewise. * db2/os_seek.c: Likewise. * db2/os_sleep.c: Likewise. * db2/os_spin.c: Likewise. * db2/os_stat.c: Likewise. * db2/os_unlink.c: Likewise. * db2/db_archive.c: Likewise. * db2/db_checkpoint.c: Likewise. * db2/db_deadlock.c: Likewise. * db2/db_dump.c: Likewise. * db2/db_dump185.c: Likewise. * db2/db_load.c: Likewise. * db2/db_printlog.c: Likewise. * db2/db_recover.c: Likewise. * db2/db_stat.c: Likewise. * db2/txn.c: Likewise. * db2/txn.src: Likewise. * db2/txn_auto.c: Likewise. * db2/txn_rec.c: Likewise. * elf/rtld.c: Move definition of __libc_stack_end to ... * sysdeps/generic/dl-sysdep.h: ...here. * sysdeps/unix/sysv/linux/fstatvfs.c: Handle nodiratime option. * sysdeps/unix/sysv/linux/bits/statvfs.h: Define ST_NODIRATIME. * sysdeps/unix/sysv/linux/sys/mount.h: Define MS_NODIRATIME. 1998-06-08 21:44 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/fstatvfs.c: Handle constant option string from mntent correctly. 1998-06-06 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sunrpc/Makefile (generated): Correct typo. 1998-06-04 Philip Blundell <philb@gnu.org> * elf/elf.h (EM_ARM, et al.): New definitions. * sysdeps/arm/dl-machine.h: Update for new draft ARM ELF ABI.
423 lines
9.4 KiB
C
423 lines
9.4 KiB
C
/*-
|
|
* See the file LICENSE for redistribution information.
|
|
*
|
|
* Copyright (c) 1997, 1998
|
|
* Sleepycat Software. All rights reserved.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#ifndef lint
|
|
static const char sccsid[] = "@(#)log_archive.c 10.37 (Sleepycat) 5/3/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 "common_ext.h"
|
|
#include "clib_ext.h" /* XXX: needed for getcwd. */
|
|
|
|
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;
|
|
u_int32_t 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) {
|
|
/*
|
|
* A return of DB_NOTFOUND means that we didn't find
|
|
* any records in the log (so we are not going to be
|
|
* deleting any log files).
|
|
*/
|
|
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], 0, 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;
|
|
int isabspath;
|
|
char *newname;
|
|
|
|
l_name = strlen(name);
|
|
isabspath = __db_abspath(name);
|
|
l_pref = isabspath ? 0 : strlen(pref);
|
|
|
|
/* Malloc space for concatenating the two. */
|
|
if ((*newnamep =
|
|
newname = (char *)__db_malloc(l_pref + l_name + 2)) == NULL)
|
|
return (ENOMEM);
|
|
|
|
/* Build the name. If `name' is an absolute path, ignore any prefix. */
|
|
if (!isabspath) {
|
|
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);
|
|
|
|
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 * const *)p1), *((char * const *)p2)));
|
|
}
|