From fc3703521650a9b6db910a50c4fc0f410496e134 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 13 Jun 1999 11:23:42 +0000 Subject: [PATCH] Update. 1999-06-13 Ulrich Drepper * sysdeps/i386/fpu/bits/mathinline.h: Add __extension__ to signbit definitions to calm down gcc. * db2/db.h: Update from db 2.7.5. * db2/db_185.h: Likewise. * db2/db_int.h: Likewise. * db2/btree/bt_compare.c: Likewise. * db2/btree/bt_conv.c: Likewise. * db2/btree/bt_curadj.c: Likewise. * db2/btree/bt_cursor.c: Likewise. * db2/btree/bt_delete.c: Likewise. * db2/btree/bt_open.c: Likewise. * db2/btree/bt_page.c: Likewise. * db2/btree/bt_put.c: Likewise. * db2/btree/bt_rec.c: Likewise. * db2/btree/bt_recno.c: Likewise. * db2/btree/bt_rsearch.c: Likewise. * db2/btree/bt_search.c: Likewise. * db2/btree/bt_split.c: Likewise. * db2/btree/bt_stat.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/common/db_salloc.c: Likewise. * db2/db/db.c: Likewise. * db2/db/db.src: Likewise. * db2/db/db_am.c: Likewise. * db2/db/db_auto.c: Likewise. * db2/db/db_dispatch.c: Likewise. * db2/db/db_dup.c: Likewise. * db2/db/db_iface.c: Likewise. * db2/db/db_join.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/db185/db185.c: Likewise. * db2/dbm/dbm.c: Likewise. * db2/hash/hash.c: 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/hash/hash_stat.c: Likewise. * db2/include/btree.h: Likewise. * db2/include/btree_ext.h: Likewise. * db2/include/clib_ext.h: Likewise. * db2/include/common_ext.h: 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_join.h: Likewise. * db2/include/db_page.h: Likewise. * db2/include/hash.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/os.h: Likewise. * db2/include/os_ext.h: Likewise. * db2/include/os_func.h: Likewise. * db2/include/txn.h: Likewise. * db2/include/txn_auto.h: Likewise. * db2/include/txn_ext.h: Likewise. * db2/include/xa.h: Likewise. * db2/include/xa_ext.h: Likewise. * db2/lock/lock.c: Likewise. * db2/lock/lock_conflict.c: Likewise. * db2/lock/lock_deadlock.c: Likewise. * db2/lock/lock_region.c: Likewise. * db2/lock/lock_util.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/mutex/uts4_cc.s: Likewise. * db2/os/os_abs.c: Likewise. * db2/os/os_alloc.c: Likewise. * db2/os/os_config.c: Likewise. * db2/os/os_dir.c: Likewise. * db2/os/os_fid.c: Likewise. * db2/os/os_fsync.c: Likewise. * db2/os/os_map.c: Likewise. * db2/os/os_oflags.c: Likewise. * db2/os/os_open.c: Likewise. * db2/os/os_rw.c: Likewise. * db2/os/os_seek.c: Likewise. * db2/os/os_sleep.c: Likewise. * db2/os/os_spin.c: Likewise. * db2/os/os_stat.c: Likewise. * db2/os/os_tmpdir.c: Likewise. * db2/os/os_unlink.c: Likewise. * db2/progs/db_archive/db_archive.c: Likewise. * db2/progs/db_checkpoint/db_checkpoint.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_printlog/README: Likewise. * db2/progs/db_printlog/commit.awk: Likewise. * db2/progs/db_printlog/count.awk: Likewise. * db2/progs/db_printlog/db_printlog.c: Likewise. * db2/progs/db_printlog/pgno.awk: Likewise. * db2/progs/db_printlog/range.awk: Likewise. * db2/progs/db_printlog/status.awk: Likewise. * db2/progs/db_printlog/txn.awk: 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.src: Likewise. * db2/txn/txn_auto.c: Likewise. * db2/txn/txn_rec.c: Likewise. * db2/xa/xa.c: Likewise. * db2/xa/xa_db.c: Likewise. * db2/xa/xa_map.c: Likewise. * db2/btree/bt_close.c: Removed. * db2/db/db_thread.c: Likewise. * db2/hash/hash_debug.c: Likewise. * db2/include/db.h.src: Likewise. * db2/include/db_int.h.src: Likewise. * db2/include/os_jump.h: Likewise. * db2/mutex/alpha.dec: Likewise. * db2/mutex/alpha.gcc: Likewise. * db2/mutex/parisc.hp: Likewise. * db2/mutex/uts4.cc.s: Likewise. * db2/Makefile: Add new routines, remove old for 2.7.5. * db2/Versions: Add internal function names for the helper programs. * db2/makedb.c: Update for new cursor callback. * Versions.def: Define versions for libdb. 1999-06-13 Thorsten Kukuk * nscd/connections.c (nscd_run): Get user ID for all non-db services. * nscd/Makefile (others, install-sbin): Add nscd_nischeck. * nscd/nscd_nischeck.c: New file. * nscd/nscd.init: Enable use of nscd_nischeck and secure tables. 1999-06-13 Andreas Jaeger * sysdeps/unix/sysv/linux/bits/socket.h: Add some missing MSG_* flags from Linux 2.2.9. 1999-06-10 Jakub Jelinek --- ChangeLog | 167 +++++++++++++++++++++++++++++++++- db2/Makefile | 22 ++--- db2/Versions | 4 + db2/makedb.c | 2 +- sysdeps/i386/fpu/bits/mathinline.h | 10 +- sysdeps/unix/sysv/linux/bits/socket.h | 22 ++++- 6 files changed, 209 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 303bacd..cc39f5e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,168 @@ +1999-06-13 Ulrich Drepper + + * sysdeps/i386/fpu/bits/mathinline.h: Add __extension__ to signbit + definitions to calm down gcc. + + * db2/db.h: Update from db 2.7.5. + * db2/db_185.h: Likewise. + * db2/db_int.h: Likewise. + * db2/btree/bt_compare.c: Likewise. + * db2/btree/bt_conv.c: Likewise. + * db2/btree/bt_curadj.c: Likewise. + * db2/btree/bt_cursor.c: Likewise. + * db2/btree/bt_delete.c: Likewise. + * db2/btree/bt_open.c: Likewise. + * db2/btree/bt_page.c: Likewise. + * db2/btree/bt_put.c: Likewise. + * db2/btree/bt_rec.c: Likewise. + * db2/btree/bt_recno.c: Likewise. + * db2/btree/bt_rsearch.c: Likewise. + * db2/btree/bt_search.c: Likewise. + * db2/btree/bt_split.c: Likewise. + * db2/btree/bt_stat.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/common/db_salloc.c: Likewise. + * db2/db/db.c: Likewise. + * db2/db/db.src: Likewise. + * db2/db/db_am.c: Likewise. + * db2/db/db_auto.c: Likewise. + * db2/db/db_dispatch.c: Likewise. + * db2/db/db_dup.c: Likewise. + * db2/db/db_iface.c: Likewise. + * db2/db/db_join.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/db185/db185.c: Likewise. + * db2/dbm/dbm.c: Likewise. + * db2/hash/hash.c: 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/hash/hash_stat.c: Likewise. + * db2/include/btree.h: Likewise. + * db2/include/btree_ext.h: Likewise. + * db2/include/clib_ext.h: Likewise. + * db2/include/common_ext.h: 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_join.h: Likewise. + * db2/include/db_page.h: Likewise. + * db2/include/hash.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/os.h: Likewise. + * db2/include/os_ext.h: Likewise. + * db2/include/os_func.h: Likewise. + * db2/include/txn.h: Likewise. + * db2/include/txn_auto.h: Likewise. + * db2/include/txn_ext.h: Likewise. + * db2/include/xa.h: Likewise. + * db2/include/xa_ext.h: Likewise. + * db2/lock/lock.c: Likewise. + * db2/lock/lock_conflict.c: Likewise. + * db2/lock/lock_deadlock.c: Likewise. + * db2/lock/lock_region.c: Likewise. + * db2/lock/lock_util.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/mutex/uts4_cc.s: Likewise. + * db2/os/os_abs.c: Likewise. + * db2/os/os_alloc.c: Likewise. + * db2/os/os_config.c: Likewise. + * db2/os/os_dir.c: Likewise. + * db2/os/os_fid.c: Likewise. + * db2/os/os_fsync.c: Likewise. + * db2/os/os_map.c: Likewise. + * db2/os/os_oflags.c: Likewise. + * db2/os/os_open.c: Likewise. + * db2/os/os_rw.c: Likewise. + * db2/os/os_seek.c: Likewise. + * db2/os/os_sleep.c: Likewise. + * db2/os/os_spin.c: Likewise. + * db2/os/os_stat.c: Likewise. + * db2/os/os_tmpdir.c: Likewise. + * db2/os/os_unlink.c: Likewise. + * db2/progs/db_archive/db_archive.c: Likewise. + * db2/progs/db_checkpoint/db_checkpoint.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_printlog/README: Likewise. + * db2/progs/db_printlog/commit.awk: Likewise. + * db2/progs/db_printlog/count.awk: Likewise. + * db2/progs/db_printlog/db_printlog.c: Likewise. + * db2/progs/db_printlog/pgno.awk: Likewise. + * db2/progs/db_printlog/range.awk: Likewise. + * db2/progs/db_printlog/status.awk: Likewise. + * db2/progs/db_printlog/txn.awk: 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.src: Likewise. + * db2/txn/txn_auto.c: Likewise. + * db2/txn/txn_rec.c: Likewise. + * db2/xa/xa.c: Likewise. + * db2/xa/xa_db.c: Likewise. + * db2/xa/xa_map.c: Likewise. + + * db2/btree/bt_close.c: Removed. + * db2/db/db_thread.c: Likewise. + * db2/hash/hash_debug.c: Likewise. + * db2/include/db.h.src: Likewise. + * db2/include/db_int.h.src: Likewise. + * db2/include/os_jump.h: Likewise. + * db2/mutex/alpha.dec: Likewise. + * db2/mutex/alpha.gcc: Likewise. + * db2/mutex/parisc.hp: Likewise. + * db2/mutex/uts4.cc.s: Likewise. + + * db2/Makefile: Add new routines, remove old for 2.7.5. + * db2/Versions: Add internal function names for the helper programs. + * db2/makedb.c: Update for new cursor callback. + * Versions.def: Define versions for libdb. + +1999-06-13 Thorsten Kukuk + + * nscd/connections.c (nscd_run): Get user ID for all non-db services. + * nscd/Makefile (others, install-sbin): Add nscd_nischeck. + * nscd/nscd_nischeck.c: New file. + * nscd/nscd.init: Enable use of nscd_nischeck and secure tables. + +1999-06-13 Andreas Jaeger + + * sysdeps/unix/sysv/linux/bits/socket.h: Add some missing + MSG_* flags from Linux 2.2.9. + 1999-06-12 Mark Kettenis * Makeconfig (static-start-installed-name): Set to @@ -18,7 +183,7 @@ * locale/lc-time.c: Add free_mem function to free if necessary statically allocated memory. -1999-06-10 Jakub Jelinek +1999-06-10 Jakub Jelinek * sysdeps/libm-ieee754/s_truncl.c: Subtract exponent bias from the raw exponent. diff --git a/db2/Makefile b/db2/Makefile index f5247b0..da1c622 100644 --- a/db2/Makefile +++ b/db2/Makefile @@ -19,7 +19,7 @@ # # Sub-makefile for libdb. # -# The code is lifted straight from the db 2.3.12 distribution +# The code is lifted straight from the db 2.7.5 distribution # with minimal changes. # @@ -28,7 +28,7 @@ subdir = db2 subdir-dirs = btree common db db185 dbm hash lock log mp mutex os txn \ progs/db_archive progs/db_checkpoint progs/db_deadlock \ progs/db_dump progs/db_dump185 progs/db_load progs/db_printlog \ - progs/db_recover progs/db_stat clib + progs/db_recover progs/db_stat clib xa headers = db.h db_185.h @@ -37,15 +37,15 @@ distribute = db_int.h config.h compat.h clib/getlong.c btree/btree.src \ txn/txn.src README LICENSE \ $(addprefix include/,btree.h btree_auto.h btree_ext.h \ clib_ext.h common_ext.h cxx_int.h \ - db.h.src db_185.h.src db_am.h db_auto.h \ + db_am.h db_auto.h \ db_cxx.h db_dispatch.h db_ext.h \ - db_int.h.src db_page.h db_shash.h db_swap.h \ + db_page.h db_shash.h db_swap.h \ hash.h hash_auto.h hash_ext.h lock.h \ lock_ext.h log.h log_auto.h log_ext.h \ mp.h mp_ext.h mutex_ext.h os_ext.h queue.h \ shqueue.h txn.h txn_auto.h txn_ext.h \ - os_func.h) \ - $(addprefix mutex/,x86.gcc uts4.cc.s sparc.gcc parisc.hp \ + os.h os_jump.h xa.h xa_ext.h) \ + $(addprefix mutex/,x86.gcc uts4_cc.s sparc.gcc parisc.hp \ parisc.gcc alpha.gcc alpha.dec README \ 68020.gcc tsl_parisc.s sco.cc) @@ -55,21 +55,21 @@ extra-libs := libdb extra-libs-others := $(extra-libs) extra-objs = getlong.o -libdb-routines := bt_close bt_compare bt_conv bt_cursor bt_delete \ +libdb-routines := bt_compare bt_conv bt_curadj bt_cursor bt_delete \ bt_open bt_page bt_put bt_rec bt_recno bt_rsearch bt_search \ bt_split bt_stat btree_auto db db_appinit db_apprec \ - db_auto \ + db_auto db_iface db_am db_join \ db_byteorder db_conv db_dispatch db_dup db_err db_log2 os_alloc \ os_abs os_config os_dir os_fid os_fsync os_map os_oflags \ os_open os_rpath os_rw os_seek os_sleep os_stat os_unlink \ - os_spin db_overflow db_pr db_rec db_region db_ret db_salloc \ - db_shash db_thread hash hash_auto hash_conv hash_debug \ + os_spin os_tmpdir db_overflow db_pr db_rec db_region db_ret \ + db_salloc db_shash hash hash_auto hash_conv \ hash_dup hash_func hash_page hash_rec hash_stat lock \ lock_conflict lock_deadlock lock_region lock_util log log_archive \ log_auto log_compare log_findckp log_get log_put log_rec \ log_register mp_bh mp_fget mp_fopen mp_fput mp_fset \ mp_open mp_pr mp_region mp_sync mutex txn txn_auto \ - txn_rec dbm db185 + txn_rec dbm db185 xa xa_db xa_map others := makedb db_dump185 db_archive db_checkpoint db_deadlock \ db_dump db_load db_recover db_stat db_printlog diff --git a/db2/Versions b/db2/Versions index af8558d..a32945a 100644 --- a/db2/Versions +++ b/db2/Versions @@ -51,4 +51,8 @@ libdb { __db_dbm_delete; __db_dbm_fetch; __db_dbm_firstkey; __db_dbm_init; __db_dbm_nextkey; __db_dbm_store; } + GLIBC_2.2 { + # Internal functions. + __ham_get_page; __ham_put_page; + } } diff --git a/db2/makedb.c b/db2/makedb.c index a7a085a..edc2c5f 100644 --- a/db2/makedb.c +++ b/db2/makedb.c @@ -359,7 +359,7 @@ print_database (db) DBC *cursor; int status; - status = db->cursor (db, NULL, &cursor); + status = db->cursor (db, NULL, &cursor, 0); if (status != 0) { error (0, status, gettext ("while reading database")); diff --git a/sysdeps/i386/fpu/bits/mathinline.h b/sysdeps/i386/fpu/bits/mathinline.h index 463d481..ac840bf 100644 --- a/sysdeps/i386/fpu/bits/mathinline.h +++ b/sysdeps/i386/fpu/bits/mathinline.h @@ -1,5 +1,5 @@ /* Inline math functions for i387. - Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by John C. Bowman , 1995. @@ -114,17 +114,19 @@ __MATH_INLINE int __signbitf (float __x) { - union { float __f; int __i; } __u = { __f: __x }; return __u.__i < 0; + __extension__ union { float __f; int __i; } __u = { __f: __x }; + return __u.__i < 0; } __MATH_INLINE int __signbit (double __x) { - union { double __d; int __i[2]; } __u = { __d: __x }; return __u.__i[1] < 0; + __extension__ union { double __d; int __i[2]; } __u = { __d: __x }; + return __u.__i[1] < 0; } __MATH_INLINE int __signbitl (long double __x) { - union { long double __l; int __i[3]; } __u = { __l: __x }; + __extension__ union { long double __l; int __i[3]; } __u = { __l: __x }; return (__u.__i[2] & 0x8000) != 0; } #endif diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h index 37a9d93..0a93a42 100644 --- a/sysdeps/unix/sysv/linux/bits/socket.h +++ b/sysdeps/unix/sysv/linux/bits/socket.h @@ -174,8 +174,28 @@ enum #endif MSG_CTRUNC = 0x08, /* Control data lost before delivery. */ #define MSG_CTRUNC MSG_CTRUNC - MSG_PROXY = 0x10 /* Supply or ask second address. */ + MSG_PROXY = 0x10, /* Supply or ask second address. */ #define MSG_PROXY MSG_PROXY + MSG_TRUNC = 0x20, +#define MSG_TRUNC MSG_TRUNC + MSG_DONTWAIT = 0x40, /* Nonblocking IO. */ +#define MSG_DONTWAIT MSG_TRUNC + MSG_EOR = 0x80, /* End of record. */ +#define MSG_EOR MSG_EOR + MSG_WAITALL = 0x100, /* Wait for a full request. */ +#define MSG_WAITALL MSG_WAITALL + MSG_FIN = 0x200, +#define MSG_FIN MSG_FIN + MSG_SYN = 0x400, +#define MSG_SYN MSG_SYN + MSG_URG = 0x800, +#define MSG_URG MSG_URG + MSG_RST = 0x1000, +#define MSG_RST MSG_RST + MSG_ERRQUEUE = 0x2000, +#define MSG_ERRQUEUE MSG_ERRQUEUE + MSG_NOSIGNAL = 0x4000 +#define MSG_NOSIGNAL MSG_NOSIGNAL }; -- 2.7.4