compat core reorg.

XPG4.2: Change member `dsize' of struct datum from int to size_t.
Version dbm_{delete,fetch,firstkey,nextkey,store}() accordingly.
Fixes PRs standards/21402 from Ben Harris and standards/25343 from
Murray Armfield.

build new hsearch() code

branches: 1.6.18;
merge DB 1.85 changes

add unintrusive Ids

branches: 1.4.2;
clean up import

Add RCS identifiers.

update db code to v1.6 from vangogh, and put it in "db" rather than "DB"

branches: 1.1.1;
Initial revision

fix spelling mistakes, mainly in comments and log messages.

Dispose the private search.h header and use <search.h>, which is a superset,
instead.

merge DB 1.85 changes

add unintrusive Ids

update db code to v1.6 from vangogh, and put it in "db" rather than "DB"

branches: 1.1.1;
Initial revision

compat core reorg.

XPG4.2: when it is attempted to open a database write-only, silently
"upgrade" to use read/write access on the database file.

XPG4.2: Change member `dsize' of struct datum from int to size_t.
Version dbm_{delete,fetch,firstkey,nextkey,store}() accordingly.
Fixes PRs standards/21402 from Ben Harris and standards/25343 from
Murray Armfield.

Clean up deleted files.

initial import of 386bsd-0.1 sources

Clean up deleted files.

initial import of 386bsd-0.1 sources

Clean up deleted files.

initial import of 386bsd-0.1 sources

branches: 1.9.6;
Convert db from UCB types to POSIX types. Prefer uint8_t for u_char as
it is mostly about the wire format.

Patched libc.so is bit-identical.

OK matt@

branches: 1.8.12;
cleanup:
- remove __P
- remove unneeded casts
- add _DIAGASSERT
- add more diagnostics for integer overflow
- fix size_t/int confusion
- make debugging and statistics code compile

Move UCB-licensed code from 4-clause to 3-clause licence.

Patches provided by Joel Baker in PR 22280, verified by myself.

delint

merge DB 1.85 changes

add unintrusive Ids

branches: 1.3.2;
clean up import

Add RCS identifiers.

branches: 1.1.1;
update db code to v1.6 from vangogh, and put it in "db" rather than "DB"

libc: Do not assume that <sys/endian.h> is transcluded via <sys/types.h>

prompted by PR pkg/59839

Introduce a HASH_BSIZE macro to return the blocksize; in the 64K case this
returns 0xffff to avoid overflow. This is used where sizes are stored.

Account for the -1 hack to fit 0x10000 in a short in hash_page.c

PR/50441: Manuel Bouyer: hash seq enumeration skips keys on big data.
XXX: pullup-7

Fix hash iteration that deletes the current element under the cursor by
adjusting the position of the iterator appropriately.
XXX: pullup 7

Delay moving to the next key until the next iteration. This avoids returning
invalid data to the user if the user deletes the current key, but it also
fails to iterate over some keys as will be shown by a unit test. From FreeBSD.

branches: 1.33.4;
- centralize opening of regular and temp files to avoid code duplication
- don't cast malloc
- use malloc sizeof(*var) instead of sizeof(type)

branches: 1.32.2;
PR/45989: Martin Husemann: lint invocation does include -w only on i386

- turn lint -w for all the platforms after fixing the lint warnings.
- add _DIAGASSERTS() for casts that would assign values to types that
would not fit.
- change types, add casts
- change into ansii prototypes
- turn on _DIAGNOSTIC for libc (during current, to be eliminated for release
builds)

approved by core@

branches: 1.31.6;
fix -Wsign-compare issues

branches: 1.30.6; 1.30.8;
Consistently include "nbtool_config.h" when cross-compiling.

In preparation for providing a db fallback in libnbcompat, remove
sccsid and conditionals around __RCSID. lint understands __RCSID enough
to ignore it, undefining LIBC_SCCS is superseded by MKSTRIPIDENT.
No functional changes.

Convert db from UCB types to POSIX types. Prefer uint8_t for u_char as
it is mostly about the wire format.

Patched libc.so is bit-identical.

OK matt@

branches: 1.27.12;
cleanup:
- remove __P
- remove unneeded casts
- add _DIAGASSERT
- add more diagnostics for integer overflow
- fix size_t/int confusion
- make debugging and statistics code compile

retrun -> return

Coverity CID 518: Avoid NULL pointer deref.

Coverity CID 508: Avoid memory leak.

WARNS=4

Initialize a variable that might confuse gcc as uninitialized.

Don't refuse to create a hash database on 0 length files. Treat
them as new files the same way that the btree code does. Note that
we do the fstat() after the open() instead of re-using the previous
result of the stat() to avoid races (we open with O_EXLOCK when we care).

branches: 1.20.2;
Revert previous commit at 1.17. a maximum BSIZE of 65536 ends up stored
as a 0 in the page, but it is supported and it does work.

hash already uses FD_CLOEXEC -- pay attention to the return value and make it
a hard failure.

Also make btree and recno uses FD_CLOEXEC.

Move UCB-licensed code from 4-clause to 3-clause licence.

Patches provided by Joel Baker in PR 22280, verified by myself.

Only allow BSIZE to 1^16 - 1:
- fix off by one error
- limit the default from the filesystem

use %p instead of %x when displaying a pointer

branches: 1.15.12;
delint

Need "namespace.h".

Use pread(2) and pwrite(2) where appropriate.

Change the file mode argument to dbopen() and the db backends from int to
mode_t.

Fix RCSID's
Fix gcc warnings.

Rename the errno field in struct htab to err, as the former name
conflicts with a macro implementation of errno.h's errno.

merge DB 1.85 changes

add unintrusive Ids

branches: 1.7.2; 1.7.4;
clean up import

fix sall memory leak. from Christopher Jon Kane <kane@kidd.vet.purdue.edu>

update to v1.72 of new DB code

upgrade new DB code to version 1.7

Declare rcsid strings so they are stored in text segment.

Add RCS identifiers.

branches: 1.1.1;
update db code to v1.6 from vangogh, and put it in "db" rather than "DB"

Avoid undefined behavior in *BIT macros

hash_page.c:792:2, left shift of 1 by 31 places cannot be represented in type 'int'
hash_page.c:855:2, left shift of 1 by 31 places cannot be represented in type 'int'
hash_page.c:779:3, left shift of 1 by 31 places cannot be represented in type 'int'

branches: 1.16.16;
Introduce a HASH_BSIZE macro to return the blocksize; in the 64K case this
returns 0xffff to avoid overflow. This is used where sizes are stored.

branches: 1.15.6; 1.15.40;
Convert db from UCB types to POSIX types. Prefer uint8_t for u_char as
it is mostly about the wire format.

Patched libc.so is bit-identical.

OK matt@

branches: 1.14.12;
cleanup:
- remove __P
- remove unneeded casts
- add _DIAGASSERT
- add more diagnostics for integer overflow
- fix size_t/int confusion
- make debugging and statistics code compile

Overhaul how `build.sh tools' are used:

* Rename "config.h" to "nbtool_config.h" and
HAVE_CONFIG_H to HAVE_NBTOOL_CONFIG_H.
This makes in more obvious in the source when we're using
tools/compat/config.h versus "standard autoconf" config.h

* Consistently move the inclusion of nbtool_config.h to before
<sys/cdefs.h> so that the former can provide __RCSID() (et al),
and there's no need to protect those macros any more.

These changes should make it easier to "tool-ify" a program by adding:
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
to the top of the source files (for the general case).

Move UCB-licensed code from 4-clause to 3-clause licence.

Patches provided by Joel Baker in PR 22280, verified by myself.

use int32_t, instead of int, for on-disk data.
(so that we are safe in the future)

Add hooks for reachover builds from src/tools/compat.

Fix various misspellings of compatible/compatibility.

branches: 1.8.12;
delint

Rename the errno field in struct htab to err, as the former name
conflicts with a macro implementation of errno.h's errno.

merge DB 1.85 changes

add unintrusive Ids

branches: 1.4.2;
clean up import

Add RCS identifiers.

update db code to v1.6 from vangogh, and put it in "db" rather than "DB"

branches: 1.1.1;
Initial revision

Clean up deleted files.

initial import of 386bsd-0.1 sources

Introduce a HASH_BSIZE macro to return the blocksize; in the 64K case this
returns 0xffff to avoid overflow. This is used where sizes are stored.

branches: 1.24.10;
PR/45989: Martin Husemann: lint invocation does include -w only on i386

- turn lint -w for all the platforms after fixing the lint warnings.
- add _DIAGASSERTS() for casts that would assign values to types that
would not fit.
- change types, add casts
- change into ansii prototypes
- turn on _DIAGNOSTIC for libc (during current, to be eliminated for release
builds)

approved by core@

branches: 1.23.6;
fix sign-compare issues

branches: 1.22.6; 1.22.8;
In preparation for providing a db fallback in libnbcompat, remove
sccsid and conditionals around __RCSID. lint understands __RCSID enough
to ignore it, undefining LIBC_SCCS is superseded by MKSTRIPIDENT.
No functional changes.

Convert db from UCB types to POSIX types. Prefer uint8_t for u_char as
it is mostly about the wire format.

Patched libc.so is bit-identical.

OK matt@

branches: 1.20.12;
cleanup:
- remove __P
- remove unneeded casts
- add _DIAGASSERT
- add more diagnostics for integer overflow
- fix size_t/int confusion
- make debugging and statistics code compile

Don't attempt to delete a NULL key. Can happen if we were the only key
in a 64K page. Thanks to Juergen Hannken-Illjes for the test.

branches: 1.18.2;
Completely rework how tools/compat is done. Purge all uses/references to
_NETBSD_SOURCE as this makes cross building from older/newer versions of
NetBSD harder, not easier (and also makes the resulting tools 'different')

Wrap all required code with the inclusion of nbtool_config.h, attempt to
only use POSIX code in all places (or when reasonable test w. configure and
provide definitions: ala u_int, etc).

Reviewed by lukem. Tested on FreeBSD 4.9, Redhat Linux ES3, NetBSD 1.6.2 x86
NetBSD current (x86 and amd64) and Solaris 9.

Fixes PR's: PR#17762 PR#25944

branches: 1.17.2;
Move UCB-licensed code from 4-clause to 3-clause licence.

Patches provided by Joel Baker in PR 22280, verified by myself.

PR/5996: ITOH Yasufumi: lib/libc/db/hash/* writes memory garbage to db file
Fixed by changing malloc's to calloc's where needed.

The Double-Semi-Colon Police.

branches: 1.14.12;
When deleting a big key, the offset of an empty page should be bsize, not
bsize-1; otherwise an insertion into the empty page will cause the new key to
be elongated by 1 byte.

Previous bug fix was slightly wrong. In this case, the data must start on a
new page, or we will mistakenly think the first page is the end of the data.

Make the packing more dense in a couple of cases.

If (keysize+datasize)%(bsize=14)==0, insertion of a `big key' would cause an
invariant (actually, an ugly hack) to fail, and all Hell would break loose.

don't compare non-pointer values against NULL.

delint

Add some braces to make egcs happy.

Fix RCSID's
Fix gcc warnings.

merge DB 1.85 changes

add unintrusive Ids

branches: 1.4.2;
clean up import

Declare rcsid strings so they are stored in text segment.

Add RCS identifiers.

branches: 1.1.1;
update db code to v1.6 from vangogh, and put it in "db" rather than "DB"

correct cast to size_t.

Cast the arg to an unsigned value to let this compile

Include string.h for memset prototype.

Avoid information leaks by zeroing memory, from FreeBSD (we had done some
already)

branches: 1.14.4; 1.14.6; 1.14.8;
In preparation for providing a db fallback in libnbcompat, remove
sccsid and conditionals around __RCSID. lint understands __RCSID enough
to ignore it, undefining LIBC_SCCS is superseded by MKSTRIPIDENT.
No functional changes.

Convert db from UCB types to POSIX types. Prefer uint8_t for u_char as
it is mostly about the wire format.

Patched libc.so is bit-identical.

OK matt@

branches: 1.12.12;
cleanup:
- remove __P
- remove unneeded casts
- add _DIAGASSERT
- add more diagnostics for integer overflow
- fix size_t/int confusion
- make debugging and statistics code compile

branches: 1.11.10; 1.11.14;
Completely rework how tools/compat is done. Purge all uses/references to
_NETBSD_SOURCE as this makes cross building from older/newer versions of
NetBSD harder, not easier (and also makes the resulting tools 'different')

Wrap all required code with the inclusion of nbtool_config.h, attempt to
only use POSIX code in all places (or when reasonable test w. configure and
provide definitions: ala u_int, etc).

Reviewed by lukem. Tested on FreeBSD 4.9, Redhat Linux ES3, NetBSD 1.6.2 x86
NetBSD current (x86 and amd64) and Solaris 9.

Fixes PR's: PR#17762 PR#25944

branches: 1.10.2;
Move UCB-licensed code from 4-clause to 3-clause licence.

Patches provided by Joel Baker in PR 22280, verified by myself.

PR/5996: ITOH Yasufumi: lib/libc/db/hash/* writes memory garbage to db file
Fixed by changing malloc's to calloc's where needed.

branches: 1.8.14;
delint

Fix RCSID's
Fix gcc warnings.

merge DB 1.85 changes

add unintrusive Ids

branches: 1.4.2;
clean up import

Declare rcsid strings so they are stored in text segment.

Add RCS identifiers.

branches: 1.1.1;
update db code to v1.6 from vangogh, and put it in "db" rather than "DB"

branches: 1.13.6;
In preparation for providing a db fallback in libnbcompat, remove
sccsid and conditionals around __RCSID. lint understands __RCSID enough
to ignore it, undefining LIBC_SCCS is superseded by MKSTRIPIDENT.
No functional changes.

Convert db from UCB types to POSIX types. Prefer uint8_t for u_char as
it is mostly about the wire format.

Patched libc.so is bit-identical.

OK matt@

branches: 1.11.12;
cleanup:
- remove __P
- remove unneeded casts
- add _DIAGASSERT
- add more diagnostics for integer overflow
- fix size_t/int confusion
- make debugging and statistics code compile

Completely rework how tools/compat is done. Purge all uses/references to
_NETBSD_SOURCE as this makes cross building from older/newer versions of
NetBSD harder, not easier (and also makes the resulting tools 'different')

Wrap all required code with the inclusion of nbtool_config.h, attempt to
only use POSIX code in all places (or when reasonable test w. configure and
provide definitions: ala u_int, etc).

Reviewed by lukem. Tested on FreeBSD 4.9, Redhat Linux ES3, NetBSD 1.6.2 x86
NetBSD current (x86 and amd64) and Solaris 9.

Fixes PR's: PR#17762 PR#25944

branches: 1.9.2;
Move UCB-licensed code from 4-clause to 3-clause licence.

Patches provided by Joel Baker in PR 22280, verified by myself.

delint

Fix RCSID's
Fix gcc warnings.

merge DB 1.85 changes

add unintrusive Ids

branches: 1.4.2;
clean up import

Declare rcsid strings so they are stored in text segment.

Add RCS identifiers.

branches: 1.1.1;
update db code to v1.6 from vangogh, and put it in "db" rather than "DB"

branches: 1.13.6;
Remove one remaining sccsid.

Fix __log2 to not loop for 0x80000000 and higher.

Convert db from UCB types to POSIX types. Prefer uint8_t for u_char as
it is mostly about the wire format.

Patched libc.so is bit-identical.

OK matt@

branches: 1.10.12;
cleanup:
- remove __P
- remove unneeded casts
- add _DIAGASSERT
- add more diagnostics for integer overflow
- fix size_t/int confusion
- make debugging and statistics code compile

Completely rework how tools/compat is done. Purge all uses/references to
_NETBSD_SOURCE as this makes cross building from older/newer versions of
NetBSD harder, not easier (and also makes the resulting tools 'different')

Wrap all required code with the inclusion of nbtool_config.h, attempt to
only use POSIX code in all places (or when reasonable test w. configure and
provide definitions: ala u_int, etc).

Reviewed by lukem. Tested on FreeBSD 4.9, Redhat Linux ES3, NetBSD 1.6.2 x86
NetBSD current (x86 and amd64) and Solaris 9.

Fixes PR's: PR#17762 PR#25944

branches: 1.8.2;
Move UCB-licensed code from 4-clause to 3-clause licence.

Patches provided by Joel Baker in PR 22280, verified by myself.

Fix RCSID's
Fix gcc warnings.

merge DB 1.85 changes

add unintrusive Ids

branches: 1.4.2;
clean up import

Declare rcsid strings so they are stored in text segment.

Add RCS identifiers.

branches: 1.1.1;
update db code to v1.6 from vangogh, and put it in "db" rather than "DB"

libc: Do not assume that <sys/endian.h> is transcluded via <sys/types.h>

prompted by PR pkg/59839

When writing out pages in the "other endian" format, make a copy instead of
trashing the in-memory one.

branches: 1.28.2;
Introduce a HASH_BSIZE macro to return the blocksize; in the 64K case this
returns 0xffff to avoid overflow. This is used where sizes are stored.

If MAX_BSIZE == hashp->BSIZE (65536) then it does not fit in a short, and
we end up storing 0... This means that every entry needs a page. We store
MAX_BSIZE - 1 here, but it would be better to always store (avail - 1) here
so that we don't waste a byte and be consistent.

branches: 1.26.4;
- centralize opening of regular and temp files to avoid code duplication
- don't cast malloc
- use malloc sizeof(*var) instead of sizeof(type)

branches: 1.25.2;
PR/45989: Martin Husemann: lint invocation does include -w only on i386

- turn lint -w for all the platforms after fixing the lint warnings.
- add _DIAGASSERTS() for casts that would assign values to types that
would not fit.
- change types, add casts
- change into ansii prototypes
- turn on _DIAGNOSTIC for libc (during current, to be eliminated for release
builds)

approved by core@

branches: 1.24.4;
Correct check for snprintf() overflow via Maksymilian Arciemowicz from FreeBSD.
(the bt one was ok, but set errno and make it the same for consistency).
[to be pulled up]

branches: 1.23.4; 1.23.6; 1.23.10; 1.23.14;
Consistently include "nbtool_config.h" when cross-compiling.

In preparation for providing a db fallback in libnbcompat, remove
sccsid and conditionals around __RCSID. lint understands __RCSID enough
to ignore it, undefining LIBC_SCCS is superseded by MKSTRIPIDENT.
No functional changes.

Convert db from UCB types to POSIX types. Prefer uint8_t for u_char as
it is mostly about the wire format.

Patched libc.so is bit-identical.

OK matt@

branches: 1.20.12;
cleanup:
- remove __P
- remove unneeded casts
- add _DIAGASSERT
- add more diagnostics for integer overflow
- fix size_t/int confusion
- make debugging and statistics code compile

branches: 1.19.2;
use FD_CLOEXEC instead of 1.

make __hash_open obey TMPDIR

resolves pr32565 and pr32454

simplify assertion.

Move UCB-licensed code from 4-clause to 3-clause licence.

Patches provided by Joel Baker in PR 22280, verified by myself.

Only squeeze a short key/value pair onto a page with other complete key/value
pairs, not onto a page containing the end of a big pair.

Return a useful errno value in the overflow case.
Also, print a message to stderr in one more case.

delint

Need "namespace.h".

Reinitialize the mkstemp() template each time it's used.

Use pread(2) and pwrite(2) where appropriate.

Fix RCSID's
Fix gcc warnings.

merge DB 1.85 changes

add unintrusive Ids

branches: 1.6.2; 1.6.4;
clean up import

get rid of extraneous include of machine/endian.h now that it's
included by sys/types.h

upgrade new DB code to version 1.7

Declare rcsid strings so they are stored in text segment.

Add RCS identifiers.

branches: 1.1.1;
update db code to v1.6 from vangogh, and put it in "db" rather than "DB"

Clean up deleted files.

initial import of 386bsd-0.1 sources

nuke old, unredeemably broken DB-based version of hsearch() et al.

branches: 1.14.10;
Per XSI5, make ENTRY.data a typeless pointer.

Per XSI5, let hcreate() take a size_t argument.

Dispose the private search.h header and use <search.h>, which is a superset,
instead.

Fix RCSID's
Fix gcc warnings.

branches: 1.10.2;
reapply diff from rev. 1.7. can't cast pointers to ints; what's really wanted
here is foo != NULL.

merge DB 1.85 changes

add unintrusive Ids

be a bit nicer with the return value

branches: 1.6.2;
clean up import

upgrade new DB code to version 1.7

Declare rcsid strings so they are stored in text segment.

Add RCS identifiers.

update db code to v1.6 from vangogh, and put it in "db" rather than "DB"

branches: 1.1.1;
Initial revision

Clean up deleted files.

initial import of 386bsd-0.1 sources

branches: 1.23.6;
Consistently include "nbtool_config.h" when cross-compiling.

In preparation for providing a db fallback in libnbcompat, remove
sccsid and conditionals around __RCSID. lint understands __RCSID enough
to ignore it, undefining LIBC_SCCS is superseded by MKSTRIPIDENT.
No functional changes.

branches: 1.21.12;
cleanup:
- remove __P
- remove unneeded casts
- add _DIAGASSERT
- add more diagnostics for integer overflow
- fix size_t/int confusion
- make debugging and statistics code compile

compat core reorg.

XPG4.2: Change member `dsize' of struct datum from int to size_t.
Version dbm_{delete,fetch,firstkey,nextkey,store}() accordingly.
Fixes PRs standards/21402 from Ben Harris and standards/25343 from
Murray Armfield.

Remove internal names for dbm_*(3); these are not required at this time.

branches: 1.17.2;
Move UCB-licensed code from 4-clause to 3-clause licence.

Patches provided by Joel Baker in PR 22280, verified by myself.

Delint.
Remove trailing ; from uses of __weak_alias(). The macro inserts this if
needed.

delint

Change the file mode argument to dbm_open() from int to mode_t.

If port provides __weak_alias(), provide an Standard C and POSIX pure
identifier namespace by renaming non standard functions and variables
such that they have a leading underscore. The library will use those
names internally. Weak aliases are used to provide the original names
to the API.

This is only the first part of this change. It is most of the functions
which are implemented in C for all NetBSD ports. Subsequent changes are
to add the same support to the remaining C files, to assembly files, and
to the automagically generated assembly source used for system calls.
When all of the above is done, ports with weak alias support should add
a definition for __weak_alias to <sys/cdefs.h>.

Fix RCSID's
Fix gcc warnings.

- convert unsafe strcpy(), strcat() and sprintf() to the `n' versions.
- some KNF.

Rename the errno field in struct htab to err, as the former name
conflicts with a macro implementation of errno.h's errno.

branches: 1.9.2;
fix a bug that shows up only on alphas: ndbm "datum" variables can't be
cast to DBTs, because the 'size' fields are int and size_t,
respectively, and that means that the DBT size field would be
partially filled with garbage on the Alpha. Bug fix sent to bostic.

merge DB 1.85 changes

add unintrusive Ids

branches: 1.6.2;
clean up import

version 1.71 of new db code

Declare rcsid strings so they are stored in text segment.

Add RCS identifiers.

update db code to v1.6 from vangogh, and put it in "db" rather than "DB"

branches: 1.1.1;
Initial revision

PR/45989: Martin Husemann: lint invocation does include -w only on i386

- turn lint -w for all the platforms after fixing the lint warnings.
- add _DIAGASSERTS() for casts that would assign values to types that
would not fit.
- change types, add casts
- change into ansii prototypes
- turn on _DIAGNOSTIC for libc (during current, to be eliminated for release
builds)

approved by core@

branches: 1.4.2; 1.4.6;
Consistently include "nbtool_config.h" when cross-compiling.

In preparation for providing a db fallback in libnbcompat, remove
sccsid and conditionals around __RCSID. lint understands __RCSID enough
to ignore it, undefining LIBC_SCCS is superseded by MKSTRIPIDENT.
No functional changes.

branches: 1.2.12;
cleanup:
- remove __P
- remove unneeded casts
- add _DIAGASSERT
- add more diagnostics for integer overflow
- fix size_t/int confusion
- make debugging and statistics code compile

compat core reorg.

Clean up deleted files.

initial import of 386bsd-0.1 sources

branches: 1.8.6;
Convert db from UCB types to POSIX types. Prefer uint8_t for u_char as
it is mostly about the wire format.

Patched libc.so is bit-identical.

OK matt@

branches: 1.7.32;
Move UCB-licensed code from 4-clause to 3-clause licence.

Patches provided by Joel Baker in PR 22280, verified by myself.

merge DB 1.85 changes

add unintrusive Ids

branches: 1.4.2;
clean up import

Add RCS identifiers.

update db code to v1.6 from vangogh, and put it in "db" rather than "DB"

branches: 1.1.1;
Initial revision

Dispose the private search.h header and use <search.h>, which is a superset,
instead.

merge DB 1.85 changes

add unintrusive Ids

branches: 1.4.2;
clean up import

Add RCS identifiers.

update db code to v1.6 from vangogh, and put it in "db" rather than "DB"

branches: 1.1.1;
Initial revision