mirror of
https://sourceware.org/git/glibc.git
synced 2024-10-03 20:47:42 +00:00
04be94a87d
1997-12-01 17:27 Ulrich Drepper <drepper@cygnus.com> * Makefile (subdirs): Add iconvdata and localedata. * iconv/gconv.h: Define UNKNOWN_10646_CHAR as error value. * iconv/gconv_conf.c (read_conf_file): Little optimization. * iconvdata/8bit-gap.c: New file. * iconvdata/8bit-generic.c: Renamed from ... * iconvdata/iso8859-generic.c: ...this. * iconvdata/configure: Removed. * iconvdata/Makefile: Add new modules and better rules. * iconvdata/iso6937.c: Minor bug fixes. * iconvdata/iso8859-1.c: Likewise. * iconvdata/t61.c: Likewise. * iconvdata/iso8859-2.c: Change to use 8bit-generic.c. Minor bug fixes. * iconvdata/iso8859-3.c: Likewise. * iconvdata/iso8859-4.c: Likewise. * iconvdata/iso8859-5.c: Likewise. * iconvdata/iso8859-6.c: Likewise. * iconvdata/iso8859-7.c: Likewise. * iconvdata/iso8859-8.c: Likewise. * iconvdata/iso8859-9.c: Likewise. * iconvdata/iso8859-10.c: Likewise. * iconvdata/ebcdic-at-de-a.c: New file. * iconvdata/ebcdic-at-de.c: New file. * iconvdata/ebcdic-ca-fr.c: New file. * iconvdata/hp-roman8.c: New file. * iconvdata/koi-8.c: New file. * iconvdata/koi8-r.c: New file. * iconvdata/koi8-h.c: New file. * iconvdata/latin-greek-1.c: New file. * iconvdata/latin-greek-1.h: New file. * iconvdata/latin-greek.c: New file. * iconvdata/latin-greek.h: New file. * iconvdata/jis0201.c: New file. * iconvdata/jis0201.h: New file. * iconvdata/jis0208.c: New file. * iconvdata/jis0208.h: New file. * iconvdata/jis0212.c: New file. * iconvdata/jis0212.h: New file. * iconvdata/sjis.c: New file. * iconvdata/gap.pl: New file. Script to generate table header. * iconvdata/gaptab.pl: New file. * iconvdata/gconv-modules: Add info about new modules. * locale/programs/charmap.c: Also examine alias names given in charmap files. * localedata/*: Add to here from add-on. We need the information to generate tables for iconv. Update from db-2.3.14. * db2/Makefile: Updated. * db2/config.h: Likewise. * db2/db.h: Likewise. * db2/db_int.h: Likewise. * db2/btree/bt_cursor.c: Likewise. * db2/btree/bt_delete.c: Likewise. * db2/btree/bt_put.c: Likewise. * db2/btree/bt_search.c: Likewise. * db2/btree/bt_split.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/db/db_auto.c: Likewise. * db2/db/db_dispatch.c: Likewise. * db2/db/db_ret.c: Likewise. * db2/dbm/dbm.c: Likewise. * db2/hash/hash_auto.c: Likewise. * db2/include/btree_ext.h: Likewise. * db2/include/common_ext.h: Likewise. * db2/include/db.h.src: Likewise. * db2/include/db_cxx.h: Likewise. * db2/include/db_ext.h: Likewise. * db2/include/db_int.h.src: Likewise. * db2/include/lock.h: Likewise. * db2/include/log.h: Likewise. * db2/include/mp.h: Likewise. * db2/include/mp_ext.h: Likewise. * db2/include/os_ext.h: Likewise. * db2/include/os_func.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_get.c: Likewise. * db2/log/log_put.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/README: Likewise. * db2/mutex/mutex.c: Likewise. * db2/os/os_open.c: Likewise. * db2/os/os_func.c: Removed. * db2/os/os_config.c: New file. * db2/os/os_spin.c: New file. * db2/txn/txn.c: Likewise. * db2/txn/txn_auto.c: Likewise. 1997-11-30 06:01 Ulrich Drepper <drepper@cygnus.com> * posix/sys/wait.h (__WAIT_INT): Don't use complex version with __typeof for C++ since this fails for class members. Reported by Neal Becker <neal@ctd.comsat.com>. 1997-11-28 11:21 Zack Weinberg <zack@rabi.phys.columbia.edu> * configure.in: Check for a working makeinfo (3.11 or better). * config.make.in: Add MAKEINFO to be substituted. * manual/Makefile: Don't update info if makeinfo is too old. 1997-11-30 05:21 Ulrich Drepper <drepper@cygnus.com> * sysdeps/alpha/setjmp.S: Define _ASM and _SETJMP_H to get definitions. * sysdeps/alpha/__longjmp.S: Likewise. * sysdeps/unix/sysv/linux/alpha/kernel_termios.h: Include <termios.h> not <bits/termios.h>. * sysdeps/unix/sysv/linux/alpha/syscalls.list: Define syscall as __llseek and make llseek and lseek64 weak aliases. * sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list: Likewise. Patches by a sun <asun@zoology.washington.edu>. 1997-11-29 19:19 Zack Weinberg <zack@rabi.phys.columbia.edu> * misc/sys/syslog.h: Delete KERNEL preprocessor conditional. * sysdeps/unix/sysv/linux/powerpc/bits/termios.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/termios.h: Likewise. * misc/sys/syslog.h: Clean up BSD header. 1997-11-29 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/bits/in.h: Add changes from Linux 2.1.67. * sysdeps/libm-ieee754/s_ctan.c (__ctan): Raise invalid exception for ctan(+-inf,x). * sysdeps/libm-ieee754/s_ctanl.c (__ctanl): Likewise. * sysdeps/libm-ieee754/s_ctanf.c (__ctanf): Likewise. * math/libm-test.c (csqrt_test): Add tests for cabs, carg, ctan, csqrt (-1), ctanh(i*pi/4). 1997-11-26 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/generic/bits/confname.h: Fix comma in enumerator. 1997-11-28 13:28 Philip Blundell <Philip.Blundell@pobox.com> * sysdeps/unix/sysv/linux/net/if_arp.h: Add more ARPHRD_ constants. 1997-11-26 Andreas Jaeger <aj@arthur.rhein-neckar.de> * wcsmbs/wcrtomb.c (__wcrtomb): Remove unused variable fake. 1997-11-26 21:28 Ulrich Drepper <drepper@cygnus.com> * sysdeps/posix/getcwd.c (GETCWD_STORYGE_CLASS): Remove definition and use. Define GETCWD_RETURN_TYPE instead and use it. * sysdeps/unix/sysv/linux/getcwd.c: Define GETCWD_RETURN_TYPE instead of GETCWD_STORYGE_CLASS and put the return type and the `internal_function' in the right order for gcc 2.7.2. 1997-11-26 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/sys/module.h: Remove file. It's incompatible with Linux 2.1.x. Packages using modules (e.g. modutils) should/do provide their own version. Suggested by Richard Henderson. * sysdeps/unix/sysv/linux/Dist: Remove sys/module.h. * sysdeps/unix/sysv/linux/Makefile (sysdep_headers) [$(subdir)=socket]: Remove sys/module.h. * libio/stdio.h: Correct comment of sys_nerr/sys_errlist.
349 lines
8.0 KiB
C
349 lines
8.0 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 sccsid[] = "@(#)log_get.c 10.22 (Sleepycat) 11/22/97";
|
|
#endif /* not lint */
|
|
|
|
#ifndef NO_SYSTEM_INCLUDES
|
|
#include <sys/types.h>
|
|
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#endif
|
|
|
|
#include "db_int.h"
|
|
#include "shqueue.h"
|
|
#include "db_page.h"
|
|
#include "log.h"
|
|
#include "hash.h"
|
|
#include "common_ext.h"
|
|
|
|
/*
|
|
* log_get --
|
|
* Get a log record.
|
|
*/
|
|
int
|
|
log_get(dblp, alsn, dbt, flags)
|
|
DB_LOG *dblp;
|
|
DB_LSN *alsn;
|
|
DBT *dbt;
|
|
int flags;
|
|
{
|
|
LOG *lp;
|
|
int ret;
|
|
|
|
/* Validate arguments. */
|
|
#define OKFLAGS (DB_CHECKPOINT | \
|
|
DB_CURRENT | DB_FIRST | DB_LAST | DB_NEXT | DB_PREV | DB_SET)
|
|
if ((ret = __db_fchk(dblp->dbenv, "log_get", flags, OKFLAGS)) != 0)
|
|
return (ret);
|
|
switch (flags) {
|
|
case DB_CHECKPOINT:
|
|
case DB_CURRENT:
|
|
case DB_FIRST:
|
|
case DB_LAST:
|
|
case DB_NEXT:
|
|
case DB_PREV:
|
|
case DB_SET:
|
|
break;
|
|
default:
|
|
return (__db_ferr(dblp->dbenv, "log_get", 1));
|
|
}
|
|
|
|
if (F_ISSET(dblp, DB_AM_THREAD)) {
|
|
if (LF_ISSET(DB_NEXT | DB_PREV | DB_CURRENT))
|
|
return (__db_ferr(dblp->dbenv, "log_get", 1));
|
|
if (!F_ISSET(dbt, DB_DBT_USERMEM | DB_DBT_MALLOC))
|
|
return (__db_ferr(dblp->dbenv, "threaded data", 1));
|
|
}
|
|
|
|
lp = dblp->lp;
|
|
|
|
LOCK_LOGREGION(dblp);
|
|
|
|
/*
|
|
* If we get one of the log's header records, repeat the operation.
|
|
* This assumes that applications don't ever request the log header
|
|
* records by LSN, but that seems reasonable to me.
|
|
*/
|
|
ret = __log_get(dblp, alsn, dbt, flags, 0);
|
|
if (ret == 0 && alsn->offset == 0) {
|
|
switch (flags) {
|
|
case DB_FIRST:
|
|
flags = DB_NEXT;
|
|
break;
|
|
case DB_LAST:
|
|
flags = DB_PREV;
|
|
break;
|
|
}
|
|
ret = __log_get(dblp, alsn, dbt, flags, 0);
|
|
}
|
|
|
|
UNLOCK_LOGREGION(dblp);
|
|
|
|
return (ret);
|
|
}
|
|
|
|
/*
|
|
* __log_get --
|
|
* Get a log record; internal version.
|
|
*
|
|
* PUBLIC: int __log_get __P((DB_LOG *, DB_LSN *, DBT *, int, int));
|
|
*/
|
|
int
|
|
__log_get(dblp, alsn, dbt, flags, silent)
|
|
DB_LOG *dblp;
|
|
DB_LSN *alsn;
|
|
DBT *dbt;
|
|
int flags, silent;
|
|
{
|
|
DB_LSN nlsn;
|
|
HDR hdr;
|
|
LOG *lp;
|
|
size_t len;
|
|
ssize_t nr;
|
|
int cnt, ret;
|
|
char *np, *tbuf;
|
|
const char *fail;
|
|
void *p, *shortp;
|
|
|
|
lp = dblp->lp;
|
|
fail = np = tbuf = NULL;
|
|
|
|
nlsn = dblp->c_lsn;
|
|
switch (flags) {
|
|
case DB_CHECKPOINT:
|
|
nlsn = dblp->lp->c_lsn;
|
|
if (IS_ZERO_LSN(nlsn)) {
|
|
__db_err(dblp->dbenv,
|
|
"log_get: unable to find checkpoint record: no checkpoint set.");
|
|
ret = ENOENT;
|
|
goto err2;
|
|
}
|
|
break;
|
|
case DB_NEXT: /* Next log record. */
|
|
if (!IS_ZERO_LSN(nlsn)) {
|
|
/* Increment the cursor by the cursor record size. */
|
|
nlsn.offset += dblp->c_len;
|
|
break;
|
|
}
|
|
/* FALLTHROUGH */
|
|
case DB_FIRST: /* Find the first log record. */
|
|
/*
|
|
* Find any log file. Note, we may have only entered records
|
|
* in the buffer, and not yet written a log file.
|
|
*/
|
|
if ((ret = __log_find(dblp, &cnt)) != 0) {
|
|
__db_err(dblp->dbenv,
|
|
"log_get: unable to find the first record: no log files found.");
|
|
goto err2;
|
|
}
|
|
|
|
/* If there's anything in the buffer, it belongs to file 1. */
|
|
if (cnt == 0)
|
|
cnt = 1;
|
|
|
|
/* Now go backwards to find the smallest one. */
|
|
for (; cnt > 1; --cnt)
|
|
if (__log_valid(dblp, NULL, cnt) != 0) {
|
|
++cnt;
|
|
break;
|
|
}
|
|
nlsn.file = cnt;
|
|
nlsn.offset = 0;
|
|
break;
|
|
case DB_CURRENT: /* Current log record. */
|
|
break;
|
|
case DB_PREV: /* Previous log record. */
|
|
if (!IS_ZERO_LSN(nlsn)) {
|
|
/* If at start-of-file, move to the previous file. */
|
|
if (nlsn.offset == 0) {
|
|
if (nlsn.file == 1 ||
|
|
__log_valid(dblp, NULL, nlsn.file - 1) != 0)
|
|
return (DB_NOTFOUND);
|
|
|
|
--nlsn.file;
|
|
nlsn.offset = dblp->c_off;
|
|
} else
|
|
nlsn.offset = dblp->c_off;
|
|
break;
|
|
}
|
|
/* FALLTHROUGH */
|
|
case DB_LAST: /* Last log record. */
|
|
nlsn.file = lp->lsn.file;
|
|
nlsn.offset = lp->lsn.offset - lp->len;
|
|
break;
|
|
case DB_SET: /* Set log record. */
|
|
nlsn = *alsn;
|
|
break;
|
|
}
|
|
|
|
retry:
|
|
/* Return 1 if the request is past end-of-file. */
|
|
if (nlsn.file > lp->lsn.file ||
|
|
(nlsn.file == lp->lsn.file && nlsn.offset >= lp->lsn.offset))
|
|
return (DB_NOTFOUND);
|
|
|
|
/* If we've switched files, discard the current fd. */
|
|
if (dblp->c_lsn.file != nlsn.file && dblp->c_fd != -1) {
|
|
(void)__db_close(dblp->c_fd);
|
|
dblp->c_fd = -1;
|
|
}
|
|
|
|
/* If the entire record is in the in-memory buffer, copy it out. */
|
|
if (nlsn.file == lp->lsn.file && nlsn.offset >= lp->w_off) {
|
|
/* Copy the header. */
|
|
p = lp->buf + (nlsn.offset - lp->w_off);
|
|
memcpy(&hdr, p, sizeof(HDR));
|
|
|
|
/* Copy the record. */
|
|
len = hdr.len - sizeof(HDR);
|
|
if ((ret = __db_retcopy(dbt, (u_int8_t *)p + sizeof(HDR),
|
|
len, &dblp->c_dbt.data, &dblp->c_dbt.ulen, NULL)) != 0)
|
|
goto err1;
|
|
goto cksum;
|
|
}
|
|
|
|
/* Acquire a file descriptor. */
|
|
if (dblp->c_fd == -1) {
|
|
if ((ret = __log_name(dblp, nlsn.file, &np)) != 0)
|
|
goto err1;
|
|
if ((ret = __db_open(np, DB_RDONLY | DB_SEQUENTIAL,
|
|
DB_RDONLY | DB_SEQUENTIAL, 0, &dblp->c_fd)) != 0) {
|
|
fail = np;
|
|
goto err1;
|
|
}
|
|
__db_free(np);
|
|
np = NULL;
|
|
}
|
|
|
|
/* Seek to the header offset and read the header. */
|
|
if ((ret = __db_seek(dblp->c_fd, 0, 0, nlsn.offset, SEEK_SET)) != 0) {
|
|
fail = "seek";
|
|
goto err1;
|
|
}
|
|
if ((ret = __db_read(dblp->c_fd, &hdr, sizeof(HDR), &nr)) != 0) {
|
|
fail = "read";
|
|
goto err1;
|
|
}
|
|
if (nr == sizeof(HDR))
|
|
shortp = NULL;
|
|
else {
|
|
/* If read returns EOF, try the next file. */
|
|
if (nr == 0) {
|
|
if (flags != DB_NEXT || nlsn.file == lp->lsn.file)
|
|
goto corrupt;
|
|
|
|
/* Move to the next file. */
|
|
++nlsn.file;
|
|
nlsn.offset = 0;
|
|
goto retry;
|
|
}
|
|
|
|
/*
|
|
* If read returns a short count the rest of the record has
|
|
* to be in the in-memory buffer.
|
|
*/
|
|
if (lp->b_off < sizeof(HDR) - nr)
|
|
goto corrupt;
|
|
|
|
/* Get the rest of the header from the in-memory buffer. */
|
|
memcpy((u_int8_t *)&hdr + nr, lp->buf, sizeof(HDR) - nr);
|
|
shortp = lp->buf + (sizeof(HDR) - nr);
|
|
}
|
|
|
|
/*
|
|
* Check for buffers of 0's, that's what we usually see during
|
|
* recovery, although it's certainly not something on which we
|
|
* can depend.
|
|
*/
|
|
if (hdr.len <= sizeof(HDR))
|
|
goto corrupt;
|
|
len = hdr.len - sizeof(HDR);
|
|
|
|
/* If we've already moved to the in-memory buffer, fill from there. */
|
|
if (shortp != NULL) {
|
|
if (lp->b_off < ((u_int8_t *)shortp - lp->buf) + len)
|
|
goto corrupt;
|
|
if ((ret = __db_retcopy(dbt, shortp, len,
|
|
&dblp->c_dbt.data, &dblp->c_dbt.ulen, NULL)) != 0)
|
|
goto err1;
|
|
goto cksum;
|
|
}
|
|
|
|
/* Allocate temporary memory to hold the record. */
|
|
if ((tbuf = (char *)__db_malloc(len)) == NULL) {
|
|
ret = ENOMEM;
|
|
goto err1;
|
|
}
|
|
|
|
/*
|
|
* Read the record into the buffer. If read returns a short count,
|
|
* there was an error or the rest of the record is in the in-memory
|
|
* buffer. Note, the information may be garbage if we're in recovery,
|
|
* so don't read past the end of the buffer's memory.
|
|
*/
|
|
if ((ret = __db_read(dblp->c_fd, tbuf, len, &nr)) != 0) {
|
|
fail = "read";
|
|
goto err1;
|
|
}
|
|
if (len - nr > sizeof(lp->buf))
|
|
goto corrupt;
|
|
if (nr != (ssize_t)len) {
|
|
if (lp->b_off < len - nr)
|
|
goto corrupt;
|
|
|
|
/* Get the rest of the record from the in-memory buffer. */
|
|
memcpy((u_int8_t *)tbuf + nr, lp->buf, len - nr);
|
|
}
|
|
|
|
/* Copy the record into the user's DBT. */
|
|
if ((ret = __db_retcopy(dbt, tbuf, len,
|
|
&dblp->c_dbt.data, &dblp->c_dbt.ulen, NULL)) != 0)
|
|
goto err1;
|
|
__db_free(tbuf);
|
|
tbuf = NULL;
|
|
|
|
cksum: if (hdr.cksum != __ham_func4(dbt->data, dbt->size)) {
|
|
if (!silent)
|
|
__db_err(dblp->dbenv, "log_get: checksum mismatch");
|
|
goto corrupt;
|
|
}
|
|
|
|
/* Update the cursor and the return lsn. */
|
|
dblp->c_off = hdr.prev;
|
|
dblp->c_len = hdr.len;
|
|
dblp->c_lsn = *alsn = nlsn;
|
|
|
|
return (0);
|
|
|
|
corrupt:/*
|
|
* This is the catchall -- for some reason we didn't find enough
|
|
* information or it wasn't reasonable information, and it wasn't
|
|
* because a system call failed.
|
|
*/
|
|
ret = EIO;
|
|
fail = "read";
|
|
|
|
err1: if (!silent)
|
|
if (fail == NULL)
|
|
__db_err(dblp->dbenv, "log_get: %s", strerror(ret));
|
|
else
|
|
__db_err(dblp->dbenv,
|
|
"log_get: %s: %s", fail, strerror(ret));
|
|
err2: if (np != NULL)
|
|
__db_free(np);
|
|
if (tbuf != NULL)
|
|
__db_free(tbuf);
|
|
return (ret);
|
|
}
|