mirror of
git://sourceware.org/git/glibc.git
synced 2025-02-23 13:09:58 +08:00
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.
422 lines
7.9 KiB
C
422 lines
7.9 KiB
C
/*-
|
|
* See the file LICENSE for redistribution information.
|
|
*
|
|
* Copyright (c) 1996, 1997
|
|
* Sleepycat Software. All rights reserved.
|
|
*/
|
|
/*
|
|
* Copyright (c) 1990, 1993
|
|
* Margo Seltzer. All rights reserved.
|
|
*/
|
|
/*
|
|
* Copyright (c) 1990, 1993
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* This code is derived from software contributed to Berkeley by
|
|
* Margo Seltzer.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by the University of
|
|
* California, Berkeley and its contributors.
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#ifndef lint
|
|
static const char sccsid[] = "@(#)dbm.c 10.7 (Sleepycat) 11/25/97";
|
|
#endif /* not lint */
|
|
|
|
#ifndef NO_SYSTEM_INCLUDES
|
|
#include <sys/param.h>
|
|
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#endif
|
|
|
|
#define DB_DBM_HSEARCH
|
|
#include "db_int.h"
|
|
|
|
#include "db_page.h"
|
|
#include "hash.h"
|
|
|
|
/* Provide prototypes here since there are none in db.h. */
|
|
int dbm_clearerr __P((DBM *));
|
|
int dbm_dirfno __P((DBM *));
|
|
int dbm_error __P((DBM *));
|
|
int dbm_pagfno __P((DBM *));
|
|
|
|
/*
|
|
*
|
|
* This package provides dbm and ndbm compatible interfaces to DB.
|
|
*
|
|
* The DBM routines, which call the NDBM routines.
|
|
*/
|
|
static DBM *__cur_db;
|
|
|
|
static void __db_no_open __P((void));
|
|
|
|
int
|
|
dbminit(file)
|
|
char *file;
|
|
{
|
|
if (__cur_db != NULL)
|
|
(void)dbm_close(__cur_db);
|
|
if ((__cur_db =
|
|
dbm_open(file, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR)) != NULL)
|
|
return (0);
|
|
if ((__cur_db = dbm_open(file, O_RDONLY, 0)) != NULL)
|
|
return (0);
|
|
return (-1);
|
|
}
|
|
|
|
datum
|
|
fetch(key)
|
|
datum key;
|
|
{
|
|
datum item;
|
|
|
|
if (__cur_db == NULL) {
|
|
__db_no_open();
|
|
item.dptr = 0;
|
|
return (item);
|
|
}
|
|
return (dbm_fetch(__cur_db, key));
|
|
}
|
|
|
|
datum
|
|
firstkey()
|
|
{
|
|
datum item;
|
|
|
|
if (__cur_db == NULL) {
|
|
__db_no_open();
|
|
item.dptr = 0;
|
|
return (item);
|
|
}
|
|
return (dbm_firstkey(__cur_db));
|
|
}
|
|
|
|
datum
|
|
nextkey(key)
|
|
datum key;
|
|
{
|
|
datum item;
|
|
|
|
if (__cur_db == NULL) {
|
|
__db_no_open();
|
|
item.dptr = 0;
|
|
return (item);
|
|
}
|
|
return (dbm_nextkey(__cur_db));
|
|
}
|
|
|
|
int
|
|
delete(key)
|
|
datum key;
|
|
{
|
|
int ret;
|
|
|
|
if (__cur_db == NULL) {
|
|
__db_no_open();
|
|
return (-1);
|
|
}
|
|
ret = dbm_delete(__cur_db, key);
|
|
if (ret == 0)
|
|
ret = (((DB *)__cur_db)->sync)((DB *)__cur_db, 0);
|
|
return (ret);
|
|
}
|
|
|
|
int
|
|
store(key, dat)
|
|
datum key, dat;
|
|
{
|
|
int ret;
|
|
|
|
if (__cur_db == NULL) {
|
|
__db_no_open();
|
|
return (-1);
|
|
}
|
|
ret = dbm_store(__cur_db, key, dat, DBM_REPLACE);
|
|
if (ret == 0)
|
|
ret = (((DB *)__cur_db)->sync)((DB *)__cur_db, 0);
|
|
return (ret);
|
|
}
|
|
|
|
static void
|
|
__db_no_open()
|
|
{
|
|
(void)fprintf(stderr, "dbm: no open database.\n");
|
|
}
|
|
|
|
/*
|
|
* This package provides dbm and ndbm compatible interfaces to DB.
|
|
*
|
|
* The NDBM routines, which call the DB routines.
|
|
*/
|
|
/*
|
|
* Returns:
|
|
* *DBM on success
|
|
* NULL on failure
|
|
*/
|
|
DBM *
|
|
dbm_open(file, oflags, mode)
|
|
const char *file;
|
|
int oflags, mode;
|
|
{
|
|
DB *dbp;
|
|
DB_INFO dbinfo;
|
|
char path[MAXPATHLEN];
|
|
|
|
memset(&dbinfo, 0, sizeof(dbinfo));
|
|
dbinfo.db_pagesize = 4096;
|
|
dbinfo.h_ffactor = 40;
|
|
dbinfo.h_nelem = 1;
|
|
|
|
/*
|
|
* XXX
|
|
* Don't use sprintf(3)/snprintf(3) -- the former is dangerous, and
|
|
* the latter isn't standard, and we're manipulating strings handed
|
|
* us by the application.
|
|
*/
|
|
if (strlen(file) + strlen(DBM_SUFFIX) + 1 > sizeof(path)) {
|
|
errno = ENAMETOOLONG;
|
|
return (NULL);
|
|
}
|
|
(void)strcpy(path, file);
|
|
(void)strcat(path, DBM_SUFFIX);
|
|
if ((errno = db_open(path,
|
|
DB_HASH, __db_oflags(oflags), mode, NULL, &dbinfo, &dbp)) != 0)
|
|
return (NULL);
|
|
return ((DBM *)dbp);
|
|
}
|
|
|
|
/*
|
|
* Returns:
|
|
* Nothing.
|
|
*/
|
|
void
|
|
dbm_close(db)
|
|
DBM *db;
|
|
{
|
|
(void)db->close(db, 0);
|
|
}
|
|
|
|
/*
|
|
* Returns:
|
|
* DATUM on success
|
|
* NULL on failure
|
|
*/
|
|
datum
|
|
dbm_fetch(db, key)
|
|
DBM *db;
|
|
datum key;
|
|
{
|
|
DBT _key, _data;
|
|
datum data;
|
|
int status;
|
|
|
|
memset(&_key, 0, sizeof(DBT));
|
|
memset(&_data, 0, sizeof(DBT));
|
|
_key.size = key.dsize;
|
|
_key.data = key.dptr;
|
|
status = db->get((DB *)db, NULL, &_key, &_data, 0);
|
|
if (status) {
|
|
data.dptr = NULL;
|
|
data.dsize = 0;
|
|
} else {
|
|
data.dptr = _data.data;
|
|
data.dsize = _data.size;
|
|
}
|
|
return (data);
|
|
}
|
|
|
|
/*
|
|
* Returns:
|
|
* DATUM on success
|
|
* NULL on failure
|
|
*/
|
|
datum
|
|
dbm_firstkey(db)
|
|
DBM *db;
|
|
{
|
|
DBT _key, _data;
|
|
datum key;
|
|
int status;
|
|
|
|
DBC *cp;
|
|
|
|
if ((cp = TAILQ_FIRST(&db->curs_queue)) == NULL)
|
|
if ((errno = db->cursor(db, NULL, &cp)) != 0) {
|
|
memset(&key, 0, sizeof(key));
|
|
return (key);
|
|
}
|
|
|
|
memset(&_key, 0, sizeof(DBT));
|
|
memset(&_data, 0, sizeof(DBT));
|
|
status = (cp->c_get)(cp, &_key, &_data, DB_FIRST);
|
|
if (status) {
|
|
key.dptr = NULL;
|
|
key.dsize = 0;
|
|
} else {
|
|
key.dptr = _key.data;
|
|
key.dsize = _key.size;
|
|
}
|
|
return (key);
|
|
}
|
|
|
|
/*
|
|
* Returns:
|
|
* DATUM on success
|
|
* NULL on failure
|
|
*/
|
|
datum
|
|
dbm_nextkey(db)
|
|
DBM *db;
|
|
{
|
|
DBC *cp;
|
|
DBT _key, _data;
|
|
datum key;
|
|
int status;
|
|
|
|
if ((cp = TAILQ_FIRST(&db->curs_queue)) == NULL)
|
|
if ((errno = db->cursor(db, NULL, &cp)) != 0) {
|
|
memset(&key, 0, sizeof(key));
|
|
return (key);
|
|
}
|
|
|
|
memset(&_key, 0, sizeof(DBT));
|
|
memset(&_data, 0, sizeof(DBT));
|
|
status = (cp->c_get)(cp, &_key, &_data, DB_NEXT);
|
|
if (status) {
|
|
key.dptr = NULL;
|
|
key.dsize = 0;
|
|
} else {
|
|
key.dptr = _key.data;
|
|
key.dsize = _key.size;
|
|
}
|
|
return (key);
|
|
}
|
|
|
|
/*
|
|
* Returns:
|
|
* 0 on success
|
|
* <0 failure
|
|
*/
|
|
int
|
|
dbm_delete(db, key)
|
|
DBM *db;
|
|
datum key;
|
|
{
|
|
DBT _key;
|
|
int ret;
|
|
|
|
memset(&_key, 0, sizeof(DBT));
|
|
_key.data = key.dptr;
|
|
_key.size = key.dsize;
|
|
ret = (((DB *)db)->del)((DB *)db, NULL, &_key, 0);
|
|
if (ret < 0)
|
|
errno = ENOENT;
|
|
else if (ret > 0) {
|
|
errno = ret;
|
|
ret = -1;
|
|
}
|
|
return (ret);
|
|
}
|
|
|
|
/*
|
|
* Returns:
|
|
* 0 on success
|
|
* <0 failure
|
|
* 1 if DBM_INSERT and entry exists
|
|
*/
|
|
int
|
|
dbm_store(db, key, data, flags)
|
|
DBM *db;
|
|
datum key, data;
|
|
int flags;
|
|
{
|
|
DBT _key, _data;
|
|
|
|
memset(&_key, 0, sizeof(DBT));
|
|
memset(&_data, 0, sizeof(DBT));
|
|
_key.data = key.dptr;
|
|
_key.size = key.dsize;
|
|
_data.data = data.dptr;
|
|
_data.size = data.dsize;
|
|
return (db->put((DB *)db,
|
|
NULL, &_key, &_data, (flags == DBM_INSERT) ? DB_NOOVERWRITE : 0));
|
|
}
|
|
|
|
int
|
|
dbm_error(db)
|
|
DBM *db;
|
|
{
|
|
HTAB *hp;
|
|
|
|
hp = (HTAB *)db->internal;
|
|
return (hp->local_errno);
|
|
}
|
|
|
|
int
|
|
dbm_clearerr(db)
|
|
DBM *db;
|
|
{
|
|
HTAB *hp;
|
|
|
|
hp = (HTAB *)db->internal;
|
|
hp->local_errno = 0;
|
|
return (0);
|
|
}
|
|
|
|
/*
|
|
* XXX
|
|
* We only have a single file descriptor that we can return, not two. Return
|
|
* the same one for both files. Hopefully, the user is using it for locking
|
|
* and picked one to use at random.
|
|
*/
|
|
int
|
|
dbm_dirfno(db)
|
|
DBM *db;
|
|
{
|
|
int fd;
|
|
|
|
(void)db->fd(db, &fd);
|
|
return (fd);
|
|
}
|
|
|
|
int
|
|
dbm_pagfno(db)
|
|
DBM *db;
|
|
{
|
|
int fd;
|
|
|
|
(void)db->fd(db, &fd);
|
|
return (fd);
|
|
}
|