tdb2: feature support.

[ccan] / ccan / tdb2 / tdb.c

diff --git a/ccan/tdb2/tdb.c b/ccan/tdb2/tdb.c
index c087aad25ea9c9e782f722de6bcacec720cac239..4ffcebf56150bffe381018b4f401aa5503455196 100644 (file)
--- a/ccan/tdb2/tdb.c
+++ b/ccan/tdb2/tdb.c
@@ -1,4 +1,5 @@
 #include "private.h"
+#include <ccan/asprintf/asprintf.h>
 #include <ccan/tdb2/tdb2.h>
 #include <assert.h>
 #include <stdarg.h>
@@ -111,6 +112,7 @@ static enum TDB_ERROR tdb_new_database(struct tdb_context *tdb,
                                         newdb.hdr.hash_seed,
                                         tdb->hash_priv);
        newdb.hdr.recovery = 0;
+       newdb.hdr.features_used = newdb.hdr.features_offered = TDB_FEATURE_MASK;
        memset(newdb.hdr.reserved, 0, sizeof(newdb.hdr.reserved));
        /* Initial hashes are empty. */
        memset(newdb.hdr.hashtable, 0, sizeof(newdb.hdr.hashtable));
@@ -236,6 +238,13 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags,
                attr = attr->base.next;
        }
 
+       if (tdb_flags & ~(TDB_INTERNAL | TDB_NOLOCK | TDB_NOMMAP | TDB_CONVERT
+                         | TDB_NOSYNC)) {
+               ecode = tdb_logerr(tdb, TDB_ERR_EINVAL, TDB_LOG_USE_ERROR,
+                                  "tdb_open: unknown flags %u", tdb_flags);
+               goto fail;
+       }
+
        if ((open_flags & O_ACCMODE) == O_WRONLY) {
                ecode = tdb_logerr(tdb, TDB_ERR_EINVAL, TDB_LOG_USE_ERROR,
                                   "tdb_open: can't open tdb %s write-only",
@@ -245,8 +254,6 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags,
 
        if ((open_flags & O_ACCMODE) == O_RDONLY) {
                tdb->read_only = true;
-               /* read only databases don't do locking */
-               tdb->flags |= TDB_NOLOCK;
                tdb->mmap_flags = PROT_READ;
        } else {
                tdb->read_only = false;
@@ -355,6 +362,16 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags,
                goto fail;
        }
 
+       /* Clear any features we don't understand. */
+       if ((open_flags & O_ACCMODE) != O_RDONLY) {
+               hdr.features_used &= TDB_FEATURE_MASK;
+               if (tdb_write_convert(tdb, offsetof(struct tdb_header,
+                                                   features_used),
+                                     &hdr.features_used,
+                                     sizeof(hdr.features_used)) == -1)
+                       goto fail;
+       }
+
        tdb->device = st.st_dev;
        tdb->inode = st.st_ino;
        tdb_unlock_open(tdb);
@@ -758,23 +775,18 @@ enum TDB_ERROR COLD tdb_logerr(struct tdb_context *tdb,
        if (!tdb->logfn)
                return ecode;
 
-       /* FIXME: Doesn't assume asprintf. */
        va_start(ap, fmt);
-       len = vsnprintf(NULL, 0, fmt, ap);
+       len = vasprintf(&message, fmt, ap);
        va_end(ap);
 
-       message = malloc(len + 1);
-       if (!message) {
+       if (len < 0) {
                tdb->logfn(tdb, TDB_LOG_ERROR, tdb->log_private,
                           "out of memory formatting message:");
                tdb->logfn(tdb, level, tdb->log_private, fmt);
-               return ecode;
+       } else {
+               tdb->logfn(tdb, level, tdb->log_private, message);
+               free(message);
        }
-       va_start(ap, fmt);
-       len = vsprintf(message, fmt, ap);
-       va_end(ap);
-       tdb->logfn(tdb, level, tdb->log_private, message);
-       free(message);
        errno = saved_errno;
        return ecode;
 }