From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 22 Nov 2015 00:59:55 +0000 (+0000)
Subject: ITS#8319 mdb_load: explain readline and mdb_cursor_put errors
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e29cfa0b4992025c15eec1af4a59599c040aa2e9;p=openldap

ITS#8319 mdb_load: explain readline and mdb_cursor_put errors
---

diff --git a/libraries/liblmdb/mdb_load.c b/libraries/liblmdb/mdb_load.c
index 160bc1b885..5373a9d5d6 100644
--- a/libraries/liblmdb/mdb_load.c
+++ b/libraries/liblmdb/mdb_load.c
@@ -400,20 +400,22 @@ int main(int argc, char *argv[])
 
 		while(1) {
 			rc = readline(&key, &kbuf);
-			if (rc == EOF)
+			if (rc)  /* rc == EOF */
 				break;
-			if (rc)
-				goto txn_abort;
 
 			rc = readline(&data, &dbuf);
-			if (rc)
+			if (rc) {
+				fprintf(stderr, "%s: line %" Z "d: failed to read key value\n", prog, lineno);
 				goto txn_abort;
-			
+			}
+
 			rc = mdb_cursor_put(mc, &key, &data, putflags);
 			if (rc == MDB_KEYEXIST && putflags)
 				continue;
-			if (rc)
+			if (rc) {
+				fprintf(stderr, "mdb_cursor_put failed, error %d %s\n", rc, mdb_strerror(rc));
 				goto txn_abort;
+			}
 			batch++;
 			if (batch == 100) {
 				rc = mdb_txn_commit(txn);