From bf7997b65c7887d2acda95f5201d818a19d81711 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 9 Jun 1998 15:16:55 +0000 Subject: Update. 1998-06-09 Ulrich Drepper * 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 * sysdeps/unix/sysv/linux/fstatvfs.c: Handle constant option string from mntent correctly. 1998-06-06 Andreas Jaeger * sunrpc/Makefile (generated): Correct typo. 1998-06-04 Philip Blundell * elf/elf.h (EM_ARM, et al.): New definitions. * sysdeps/arm/dl-machine.h: Update for new draft ARM ELF ABI. --- db2/dbm/dbm.c | 67 ++++++++++++++++++++++++++++++----------------------------- 1 file changed, 34 insertions(+), 33 deletions(-) (limited to 'db2/dbm') diff --git a/db2/dbm/dbm.c b/db2/dbm/dbm.c index 81f4bba..261fe81 100644 --- a/db2/dbm/dbm.c +++ b/db2/dbm/dbm.c @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1996, 1997 + * Copyright (c) 1996, 1997, 1998 * Sleepycat Software. All rights reserved. */ /* @@ -47,15 +47,14 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "@(#)dbm.c 10.10 (Sleepycat) 1/16/98"; +static const char sccsid[] = "@(#)dbm.c 10.16 (Sleepycat) 5/7/98"; #endif /* not lint */ #ifndef NO_SYSTEM_INCLUDES -#include +#include #include #include -#include #include #endif @@ -82,7 +81,7 @@ __db_dbm_init(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) + dbm_open(file, O_CREAT | O_RDWR, __db_omode("rw----"))) != NULL) return (0); if ((__cur_db = dbm_open(file, O_RDONLY, 0)) != NULL) return (0); @@ -244,19 +243,19 @@ __db_ndbm_fetch(db, key) { DBT _key, _data; datum data; - int status; + int ret; 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 { + if ((ret = db->get((DB *)db, NULL, &_key, &_data, 0)) == 0) { data.dptr = _data.data; data.dsize = _data.size; + } else { + data.dptr = NULL; + data.dsize = 0; + __set_errno (ret == DB_NOTFOUND ? ENOENT : ret); } return (data); } @@ -273,7 +272,7 @@ __db_ndbm_firstkey(db) { DBT _key, _data; datum key; - int status; + int ret; DBC *cp; @@ -285,13 +284,13 @@ __db_ndbm_firstkey(db) 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 { + if ((ret = (cp->c_get)(cp, &_key, &_data, DB_FIRST)) == 0) { key.dptr = _key.data; key.dsize = _key.size; + } else { + key.dptr = NULL; + key.dsize = 0; + __set_errno (ret == DB_NOTFOUND ? ENOENT : ret); } return (key); } @@ -309,7 +308,7 @@ __db_ndbm_nextkey(db) DBC *cp; DBT _key, _data; datum key; - int status; + int ret; if ((cp = TAILQ_FIRST(&db->curs_queue)) == NULL) if ((errno = db->cursor(db, NULL, &cp)) != 0) { @@ -319,13 +318,13 @@ __db_ndbm_nextkey(db) 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 { + if ((ret = (cp->c_get)(cp, &_key, &_data, DB_NEXT)) == 0) { key.dptr = _key.data; key.dsize = _key.size; + } else { + key.dptr = NULL; + key.dsize = 0; + __set_errno (ret == DB_NOTFOUND ? ENOENT : ret); } return (key); } @@ -347,14 +346,10 @@ __db_ndbm_delete(db, key) 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); + if ((ret = (((DB *)db)->del)((DB *)db, NULL, &_key, 0)) == 0) + return (0); + errno = ret == DB_NOTFOUND ? ENOENT : ret; + return (-1); } weak_alias (__db_ndbm_delete, dbm_delete) @@ -371,6 +366,7 @@ __db_ndbm_store(db, key, data, flags) int flags; { DBT _key, _data; + int ret; memset(&_key, 0, sizeof(DBT)); memset(&_data, 0, sizeof(DBT)); @@ -378,8 +374,13 @@ __db_ndbm_store(db, key, data, flags) _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)); + if ((ret = db->put((DB *)db, NULL, + &_key, &_data, flags == DBM_INSERT ? DB_NOOVERWRITE : 0)) == 0) + return (0); + if (ret == DB_KEYEXIST) + return (1); + errno = ret; + return (-1); } weak_alias (__db_ndbm_store, dbm_store) -- cgit v1.1