8 files changed, 384 insertions, 229 deletions

diff --git a/doc/gdbm.3 b/doc/gdbm.3
index 6525112..cfef634 100644
--- a/doc/gdbm.3
+++ b/doc/gdbm.3
@@ -15,3 +15,3 @@
 .\" along with GDBM. If not, see <http://www.gnu.org/licenses/>. */
-.TH GDBM 3 "January 27, 2020" "GDBM" "GDBM User Reference"
+.TH GDBM 3 "March 21, 2021" "GDBM" "GDBM User Reference"
 .SH NAME
@@ -35,7 +35,7 @@ compatibility.
 .br
-.BI "int gdbm_store (GDBM_FILE " dbf ", datum " key ", datum " content ", int " flag );
+.BI "int gdbm_store (GDBM_FILE " dbf ", datum " key ", datum " content ", int " flag ");"
 .br
-.BI "datum gdbm_fetch (GDBM_FILE " dbf ", datum " key );
+.BI "datum gdbm_fetch (GDBM_FILE " dbf ", datum " key ");"
 .br
-.BI "int gdbm_delete (GDBM_FILE " dbf ", datum " key );
+.BI "int gdbm_delete (GDBM_FILE " dbf ", datum " key ");"
 .br
@@ -43,3 +43,5 @@ compatibility.
 .br
-.BI "datum gdbm_nextkey (GDBM_FILE " dbf ", datum " key );
+.BI "datum gdbm_nextkey (GDBM_FILE " dbf ", datum " key ");"
+.br
+.BI "int gdbm_recover (GDBM_FILE " dbf ", gdbm_recovery *" rcvr ", int" flags ");"
 .br
@@ -49,5 +51,5 @@ compatibility.
 .br
-.BI "int gdbm_exists (GDBM_FILE " dbf ", datum " key );
+.BI "int gdbm_exists (GDBM_FILE " dbf ", datum " key ");"
 .br
-.BI "const char *gdbm_strerror (gdbm_error " errno );
+.BI "const char *gdbm_strerror (gdbm_error " errno ");"
 .br
@@ -57,2 +59,7 @@ compatibility.
 .br
+.BI "int gdbm_count (GDBM_FILE " dbf ", gdbm_count_t *" pcount ");"
+.br
+.BI "int gdbm_bucket_count (GDBM_FILE " dbf ", size_t *" pcount ");"
+.br
+.BI "int gdbm_avail_verify (GDBM_FILE " dbf ");"
 .PP
@@ -163,2 +170,11 @@ Causes all database operations to be synchronized to the disk,
 Prevents the library from performing any locking on the database file.
+.TP
+.B GDBM_CLOEXEC
+Set the close-on-exec flag on the database file descriptor.
+.TP
+.B GDBM_XVERIFY
+Enable additional consistency checks.  With this flag, eventual
+corruptions of the database are discovered when opening it, instead of
+when a corrupted structure is read during normal operation.  However,
+on large databases, it can slow down the opening process.
 .PP
@@ -329,5 +345,9 @@ currently:
 .B GDBM_CACHESIZE
-Set the size of the internal bucket cache. This option may only be set once
-on each \fIGDBM_FILE\fR descriptor, and is set automatically to 100 upon the
-first access to the database.
+Set the size of the internal bucket cache.  By default, the cache size
+is selected to provide for the optimal performance.  Use this option,
+if you wish to limit the memory usage at the expense of performance.
+.sp
+Use the
+.B GDBM_CACHE_AUTO
+constant to return to the default.
 .TP
diff --git a/doc/gdbm.texi b/doc/gdbm.texi
index 9c679ca..5f42ced 100644
--- a/doc/gdbm.texi
+++ b/doc/gdbm.texi
@@ -70,3 +70,3 @@ Documentation License.''
 @sp 1
-@center for GNU @code{dbm}, Version @value{VERSION}
+@center for GNU @command{dbm}, Version @value{VERSION}
 @page
@@ -87,4 +87,4 @@ Documentation License.''
 
-GNU @code{dbm} is a library of functions implementing a hashed database
-on a disk file.  This manual documents GNU @code{dbm} Version @value{VERSION}
+GNU @command{dbm} is a library of functions implementing a hashed database
+on a disk file.  This manual documents GNU @command{dbm} Version @value{VERSION}
 (@code{gdbm}).  The software was originally written by Philip A.@:
@@ -117,3 +117,3 @@ Functions:
 * Variables::                  Useful global variables.
-
+* Additional functions::
 * Error codes::                Error codes returned by @code{gdbm} calls.
@@ -145,4 +145,4 @@ Other topics:
 This library is @dfn{free}; this means that everyone is free to use
-it and free to redistribute it on a free basis.  GNU @code{dbm} (@code{gdbm})
-is not in the public domain; it is copyrighted and there
+it and free to redistribute it on a free basis.  GNU @command{dbm}
+(@code{gdbm}) is not in the public domain; it is copyrighted and there
 are restrictions on its distribution, but these restrictions are
@@ -178,6 +178,6 @@ the distribution of @code{gdbm}.
 @node Intro
-@chapter Introduction to GNU @code{dbm}.
+@chapter Introduction to GNU @command{dbm}.
 
-GNU @code{dbm} (@code{gdbm}) is a library of database functions that use
-extensible hashing and works similar to the standard UNIX @code{dbm}
+GNU @command{dbm} (@code{gdbm}) is a library of database functions that use
+extensible hashing and works similar to the standard UNIX @command{dbm}
 functions.  These routines are provided to a programmer needing to
@@ -346,3 +346,3 @@ no such key
 @deftypefn {gdbm interface} GDBM_FILE gdbm_open (const char *@var{name}, int @var{block_size}, @
-  int @var{flags}, int @var{mode}, void (*fatal_func)(const char *))
+  int @var{flags}, int @var{mode}, void (*@var{fatal_func})(const char *))
 Initializes @code{gdbm} system.  If the file has a size of zero bytes, a file
@@ -365,5 +365,5 @@ exact number of directory entries, so that the effective block size
 can be slightly greater than requested.  However, if the 
-@samp{GDBM_BSEXACT} flag is set and the size needs to be adjusted, the
-function will return with error status, setting the @samp{gdbm_errno}
-variable to @samp{GDBM_BLOCK_SIZE_ERROR}.
+@code{GDBM_BSEXACT} flag is set and the size needs to be adjusted, the
+function will return with error status, setting the @code{gdbm_errno}
+variable to @code{GDBM_BLOCK_SIZE_ERROR}.
 
@@ -374,10 +374,10 @@ variable to @samp{GDBM_BLOCK_SIZE_ERROR}.
 @kwindex GDBM_NEWDB
-If @code{flags} is set to @samp{GDBM_READER}, the user wants to just read the
+If @code{flags} is set to @code{GDBM_READER}, the user wants to just read the
 database and any call to @code{gdbm_store} or @code{gdbm_delete} will fail.
 Many readers can access the database at the same time.  If @code{flags} is
-set to @samp{GDBM_WRITER}, the user wants both read and write access
+set to @code{GDBM_WRITER}, the user wants both read and write access
 to the database and requires exclusive access.  If @code{flags} is set
-to @samp{GDBM_WRCREAT}, the user wants both read and write access to
+to @code{GDBM_WRCREAT}, the user wants both read and write access to
 the database and wants it created if it does not already exist.  If
-@code{flags} is set to @samp{GDBM_NEWDB}, the user want a new database
+@code{flags} is set to @code{GDBM_NEWDB}, the user want a new database
 created, regardless of whether one existed, and wants read and write
@@ -388,14 +388,33 @@ access to the new database.
 @kwindex GDBM_NOMMAP
-The following may also be logically or'd into the database flags:
-@samp{GDBM_SYNC}, which causes all database operations to be
-synchronized to the disk, @samp{GDBM_NOLOCK}, which prevents the library 
-from performing any locking on the database file, and @samp{GDBM_NOMMAP},
-which disables the memory mapping mechanism.  The option @samp{GDBM_FAST} is
-now obsolete, since @code{gdbm} defaults to no-sync mode.
+The following constants may also be logically or'd into the database
+flags:
+
+@table @code
+@kwindex GDBM_SYNC
+@item GDBM_SYNC
+Synchronize all database operations to disk immediately.  This
+provides for the best database consistency at the expense of severe
+performance degradation.
+
+@kwindex GDBM_FAST
+@item GDBM_FAST
+A reverse of @code{GDBM_SYNC}.  Synchronize writes only when needed.
+This is the default.  The flag is provided for compatibility with
+previous versions of @command{GDBM}.
+
+@kwindex GDBM_NOLOCK
+@item GDBM_NOLOCK
+Don't lock the database file.  Use this flag if you intend to do
+locking separately.
+
+@kwindex GDBM_NOMMAP
+@item GDBM_NOMMAP
+Disable memory mapping mechanism.  This degrades performance.
 
 @kwindex GDBM_BSEXACT
+@item GDBM_BSEXACT
 If this flag is set and the requested @var{block_size} cannot be used
 without adjustment, @code{gdbm_open} will refuse to create the
-databases.  In this case it will set the @samp{gdbm_errno}
-variable to @samp{GDBM_BLOCK_SIZE_ERROR} and return @samp{NULL}.
+databases.  In this case it will set the @code{gdbm_errno}
+variable to @code{GDBM_BLOCK_SIZE_ERROR} and return @code{NULL}.
 
@@ -403,3 +422,5 @@ variable to @samp{GDBM_BLOCK_SIZE_ERROR} and return @samp{NULL}.
 @cindex close-on-exec
-If the host @samp{open} call
+@item GDBM_CLOEXEC
+Set the close-on-exec flag on the database file descriptor.  The
+@code{libc} must support the @code{O_CLOEXEC} flag@footnote{
 @ifhtml
@@ -408,9 +429,18 @@ If the host @samp{open} call
 @ifnothtml
-(@pxref{open,,,open(2),open(2) man page})
+@xref{open,,,open(2),open(2) man page}
 @end ifnothtml
-supports the @samp{O_CLOEXEC} flag, the @samp{GDBM_CLOEXEC} can be
-or'd into the flags, to enable the close-on-exec flag for the
-database file descriptor.
+}
+
+@kwindex GDBM_XVERIFY
+@item GDBM_XVERIFY
+Enable additional consistency checks.  With this flag, eventual
+corruptions of the database are discovered when opening it, instead of
+when a corrupted structure is read during normal operation.  However,
+on large databases, it can slow down the opening process.
+
+@xref{Additional functions}.
+@end table
+
 @item mode
-File mode (see
+File mode@footnote{See
 @ifhtml
@@ -419,3 +449,3 @@ File mode (see
 @ifnothtml
-@ref{chmod,,change permissions of a file,chmod(2),
+@xref{chmod,,change permissions of a file,chmod(2),
 chmod(2) man page},
@@ -427,8 +457,8 @@ and
 @ifnothtml
-@pxref{open,,open a file,open(2), open(2) man page}),
+@ref{open,,open a file,open(2), open(2) man page}.},
 @end ifnothtml
-which is used if the file is created).
+which is used if the file is created.
 @item fatal_func
 A function for @code{gdbm} to call if it detects a fatal error.  The only
-parameter of this function is a string.  If the value of @samp{NULL} is
+parameter of this function is a string.  If the value of @code{NULL} is
 provided, @code{gdbm} will use a default function.
@@ -437,3 +467,3 @@ provided, @code{gdbm} will use a default function.
 The return value, is the pointer needed by all other functions to
-access that @code{gdbm} file.  If the return is the @samp{NULL} pointer,
+access that @code{gdbm} file.  If the return is the @code{NULL} pointer,