Add MDB_NOSUBDIR option

Create the data file using exactly the given pathname, and
the lock file using a suffix on the data file name.

diff --git a/libraries/libmdb/mdb.c b/libraries/libmdb/mdb.c
index 89048ae27217bce5d3456521ba23f699e122200f..dd60fb1af06a25b81f0fd68f3e4edb7267327558 100644 (file)
--- a/libraries/libmdb/mdb.c
+++ b/libraries/libmdb/mdb.c
@@ -2657,6 +2657,9 @@ fail:
 #define LOCKNAME       "/lock.mdb"
        /** The name of the data file in the DB environment */
 #define DATANAME       "/data.mdb"
+       /** The suffix of the lock file when no subdir is used */
+#define LOCKSUFF       "-lock"
+
 int
 mdb_env_open(MDB_env *env, const char *path, unsigned int flags, mode_t mode)
 {
@@ -2664,12 +2667,23 @@ mdb_env_open(MDB_env *env, const char *path, unsigned int flags, mode_t mode)
        char *lpath, *dpath;
 
        len = strlen(path);
-       lpath = malloc(len + sizeof(LOCKNAME) + len + sizeof(DATANAME));
+       if (flags & MDB_NOSUBDIR) {
+               rc = len + sizeof(LOCKSUFF) + len + 1;
+       } else {
+               rc = len + sizeof(LOCKNAME) + len + sizeof(DATANAME);
+       }
+       lpath = malloc(rc);
        if (!lpath)
                return ENOMEM;
-       dpath = lpath + len + sizeof(LOCKNAME);
-       sprintf(lpath, "%s" LOCKNAME, path);
-       sprintf(dpath, "%s" DATANAME, path);
+       if (flags & MDB_NOSUBDIR) {
+               dpath = lpath + len + sizeof(LOCKSUFF);
+               sprintf(lpath, "%s" LOCKSUFF, path);
+               strcpy(dpath, path);
+       } else {
+               dpath = lpath + len + sizeof(LOCKNAME);
+               sprintf(lpath, "%s" LOCKNAME, path);
+               sprintf(dpath, "%s" DATANAME, path);
+       }
 
        rc = mdb_env_setup_locks(env, lpath, mode, &excl);
        if (rc)

diff --git a/libraries/libmdb/mdb.h b/libraries/libmdb/mdb.h
index 949936782fc41c7b2d6371869608b43c596ab728..7653542e6b323f5308f05aefd21becfa32e83513 100644 (file)
--- a/libraries/libmdb/mdb.h
+++ b/libraries/libmdb/mdb.h
@@ -149,6 +149,8 @@ typedef void (MDB_rel_func)(MDB_val *item, void *oldptr, void *newptr, void *rel
  */
        /** mmap at a fixed address */
 #define MDB_FIXEDMAP   0x01
+       /** no environment directory */
+#define MDB_NOSUBDIR   0x02
        /** don't fsync after commit */
 #define MDB_NOSYNC             0x10000
        /** read only */