From 311f071c1f1f2b701202b4fbc1752196aac999bc Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@openldap.org>
Date: Fri, 23 Oct 2020 17:47:15 +0100
Subject: [PATCH] Support db_pagesize in mdb_load

Since setting was added in de08119a296a4e8569fa04d7bfcbc7b3c2b41f2f
---
 libraries/liblmdb/mdb_load.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/libraries/liblmdb/mdb_load.c b/libraries/liblmdb/mdb_load.c
index c9b2ad9..499cd0a 100644
--- a/libraries/liblmdb/mdb_load.c
+++ b/libraries/liblmdb/mdb_load.c
@@ -40,6 +40,8 @@ static MDB_envinfo info;
 static MDB_val kbuf, dbuf;
 static MDB_val k0buf;
 
+static unsigned int pagesize;
+
 #define Yu	MDB_PRIy(u)
 
 #define STRLENOF(s)	(sizeof(s)-1)
@@ -128,6 +130,17 @@ static void readhdr(void)
 					prog, lineno, (char *)dbuf.mv_data+STRLENOF("maxreaders="));
 				exit(EXIT_FAILURE);
 			}
+		} else if (!strncmp(dbuf.mv_data, "db_pagesize=", STRLENOF("db_pagesize="))) {
+			int i;
+			ptr = memchr(dbuf.mv_data, '\n', dbuf.mv_size);
+			if (ptr) *ptr = '\0';
+			i = sscanf((char *)dbuf.mv_data+STRLENOF("db_pagesize="),
+				"%u", &pagesize);
+			if (i != 1) {
+				fprintf(stderr, "%s: line %"Yu": invalid pagesize %s\n",
+					prog, lineno, (char *)dbuf.mv_data+STRLENOF("db_pagesize="));
+				exit(EXIT_FAILURE);
+			}
 		} else {
 			int i;
 			for (i=0; dbflags[i].bit; i++) {
@@ -384,6 +397,9 @@ int main(int argc, char *argv[])
 	if (info.me_mapsize)
 		mdb_env_set_mapsize(env, info.me_mapsize);
 
+	if (pagesize)
+		mdb_env_set_pagesize(env, pagesize);
+
 	if (info.me_mapaddr)
 		envflags |= MDB_FIXEDMAP;
 
@@ -443,6 +459,10 @@ int main(int argc, char *argv[])
 				fprintf(stderr, "%s: line %"Yu": failed to read key value\n", prog, lineno);
 				goto txn_abort;
 			}
+			if (!key.mv_size) {
+				fprintf(stderr, "%s: line %"Yu": zero-length key(ignored)\n", prog, lineno);
+				continue;
+			}
 
 			if (append) {
 				appflag = MDB_APPEND;